From 034cc9f1a474d597a3ef0a4dcc33ec40cf92ff8e Mon Sep 17 00:00:00 2001
From: robertl <robertl@f51c46e8-681c-474f-0cfe-069cfd0219fb>
Date: Thu, 30 Jun 2005 15:47:31 +0000
Subject: [PATCH] Add sat and fix to stored position information.  Removed GPX
 fondling from vito. Regenerate Vito reference files.

---
 gpsbabel/defs.h                        |   3 +-
 gpsbabel/gpx.c                         |  36 ++
 gpsbabel/reference/track/vitosmt_t.gpx | 379 +++++++++++
 gpsbabel/reference/vitosmt.gpx         | 851 ++++++++++++++++++-------
 gpsbabel/vitosmt.c                     |  58 +-
 5 files changed, 1047 insertions(+), 280 deletions(-)

diff --git a/gpsbabel/defs.h b/gpsbabel/defs.h
index fe22f63b1..96ef6a61f 100644
--- a/gpsbabel/defs.h
+++ b/gpsbabel/defs.h
@@ -259,7 +259,8 @@ typedef struct {
 	float pdop;		
 	float course;	/* Optional: degrees true */
 	float speed;   	/* Optional: meters per second. */
-	char fix, sat;
+	fix_type fix;	/* Optional: 3d, 2d, etc. */
+	int  sat;	/* Optional: number of sats used for fix */
 	
 	geocache_data gc_data;
 	xml_tag *gpx_extras;
diff --git a/gpsbabel/gpx.c b/gpsbabel/gpx.c
index 093d3400e..bbd8d2543 100644
--- a/gpsbabel/gpx.c
+++ b/gpsbabel/gpx.c
@@ -95,6 +95,8 @@ typedef enum {
 	tt_pdop,		/* PDOPS are common for all three */
 	tt_hdop,		/* PDOPS are common for all three */
 	tt_vdop,		/* PDOPS are common for all three */
+	tt_fix,
+	tt_sat,
 	tt_cache,
 	tt_cache_name,
 	tt_cache_container,
@@ -218,6 +220,12 @@ tag_mapping tag_path_map[] = {
 	{ tt_trk_trkseg_trkpt_speed, 0, "/gpx/trk/trkseg/trkpt/speed" },
 
 	/* Common to tracks, routes, and waypts */
+	{ tt_fix,  0, "/gpx/wpt/fix" },
+	{ tt_fix,  0, "/gpx/trk/trkseg/trkpt/fix" },
+	{ tt_fix,  0, "/gpx/rte/rtept/fix" },
+	{ tt_sat,  0, "/gpx/wpt/sat" },
+	{ tt_sat,  0, "/gpx/trk/trkseg/trkpt/sat" },
+	{ tt_sat,  0, "/gpx/rte/rtept/sat" },
 	{ tt_pdop, 0, "/gpx/wpt/pdop" },
 	{ tt_pdop, 0, "/gpx/trk/trkseg/trkpt/pdop" },
 	{ tt_pdop, 0, "/gpx/rte/rtept/pdop" },
@@ -825,6 +833,12 @@ gpx_end(void *data, const char *el)
 	case tt_vdop:
 		wpt_tmp->vdop = atof(cdatastrp);
 		break;
+	case tt_sat:
+		wpt_tmp->sat = atof(cdatastrp);
+		break;
+	case tt_fix:
+		wpt_tmp->fix = atof(cdatastrp);
+		break;
 	case tt_unknown:
 		end_something_else();
 		*s = 0;
@@ -1180,6 +1194,28 @@ write_gpx_url(const waypoint *waypointp)
 static void
 gpx_write_common_acc(const waypoint *waypointp, const char *indent)
 {
+	char *fix = NULL;
+
+	switch (waypointp->fix) {
+		case fix_2d:
+			fix = "2d";
+			break;
+		case fix_3d:
+			fix = "3d";
+			break;
+		case fix_dgps:
+			fix = "dgps";
+			break;
+		case fix_pps:
+			fix = "pps";
+			break;
+	}
+	if (fix) {
+		fprintf(ofd, "%s<fix>%s</fix>\n", indent, fix);
+	}
+	if (waypointp->sat) {
+		fprintf(ofd, "%s<sat>%d</sat>\n", indent, waypointp->sat);
+	}
 	if (waypointp->hdop) {
 		fprintf(ofd, "%s<hdop>%f</hdop>\n", indent, waypointp->hdop);
 	}
diff --git a/gpsbabel/reference/track/vitosmt_t.gpx b/gpsbabel/reference/track/vitosmt_t.gpx
index 5b85ba0c4..f692d17b2 100644
--- a/gpsbabel/reference/track/vitosmt_t.gpx
+++ b/gpsbabel/reference/track/vitosmt_t.gpx
@@ -14,6 +14,8 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>0.000000</course>
   <speed>0.000000</speed>
   <name>WP0001</name>
+  <fix>2d</fix>
+  <sat>3</sat>
   <pdop>30.600000</pdop>
 </trkpt>
 <trkpt lat="45.460339984" lon="-75.767591640">
@@ -22,6 +24,8 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>0.000000</course>
   <speed>0.000000</speed>
   <name>WP0002</name>
+  <fix>2d</fix>
+  <sat>3</sat>
   <pdop>30.600000</pdop>
 </trkpt>
 <trkpt lat="45.458376651" lon="-75.768483307">
@@ -30,6 +34,8 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>251.259995</course>
   <speed>1.419867</speed>
   <name>WP0003</name>
+  <fix>dgps</fix>
+  <sat>7</sat>
   <pdop>1.400000</pdop>
 </trkpt>
 <trkpt lat="45.458293318" lon="-75.768566640">
@@ -38,6 +44,8 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>260.420013</course>
   <speed>1.450733</speed>
   <name>WP0004</name>
+  <fix>dgps</fix>
+  <sat>5</sat>
   <pdop>2.400000</pdop>
 </trkpt>
 <trkpt lat="45.458298318" lon="-75.768701640">
@@ -46,6 +54,8 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>232.600006</course>
   <speed>0.334389</speed>
   <name>WP0005</name>
+  <fix>dgps</fix>
+  <sat>5</sat>
   <pdop>2.400000</pdop>
 </trkpt>
 <trkpt lat="45.458266651" lon="-75.769021640">
@@ -54,6 +64,8 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>297.440002</course>
   <speed>1.106055</speed>
   <name>WP0006</name>
+  <fix>dgps</fix>
+  <sat>6</sat>
   <pdop>2.200000</pdop>
 </trkpt>
 <trkpt lat="45.458204984" lon="-75.770038307">
@@ -62,6 +74,8 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>290.190002</course>
   <speed>1.162644</speed>
   <name>WP0007</name>
+  <fix>dgps</fix>
+  <sat>9</sat>
   <pdop>1.000000</pdop>
 </trkpt>
 <trkpt lat="45.458274984" lon="-75.770526640">
@@ -70,6 +84,8 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>30.709999</course>
   <speed>1.111200</speed>
   <name>WP0008</name>
+  <fix>dgps</fix>
+  <sat>8</sat>
   <pdop>1.400000</pdop>
 </trkpt>
 <trkpt lat="45.458353318" lon="-75.770481640">
@@ -78,6 +94,8 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>32.630001</course>
   <speed>0.185200</speed>
   <name>WP0009</name>
+  <fix>dgps</fix>
+  <sat>10</sat>
   <pdop>1.000000</pdop>
 </trkpt>
 <trkpt lat="45.492471651" lon="-75.717699974">
@@ -86,6 +104,8 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>0.000000</course>
   <speed>0.000000</speed>
   <name>WP0010</name>
+  <fix>2d</fix>
+  <sat>3</sat>
   <pdop>7.000000</pdop>
 </trkpt>
 <trkpt lat="45.492506651" lon="-75.717636640">
@@ -94,6 +114,8 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>150.550003</course>
   <speed>1.476456</speed>
   <name>WP0011</name>
+  <fix>dgps</fix>
+  <sat>5</sat>
   <pdop>2.600000</pdop>
 </trkpt>
 <trkpt lat="45.492283318" lon="-75.717694974">
@@ -102,6 +124,8 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>140.809998</course>
   <speed>1.533044</speed>
   <name>WP0012</name>
+  <fix>3d</fix>
+  <sat>4</sat>
   <pdop>3.400000</pdop>
 </trkpt>
 <trkpt lat="45.492396651" lon="-75.717684974">
@@ -110,6 +134,8 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>165.830002</course>
   <speed>1.342700</speed>
   <name>WP0013</name>
+  <fix>dgps</fix>
+  <sat>5</sat>
   <pdop>2.600000</pdop>
 </trkpt>
 <trkpt lat="45.492381651" lon="-75.717586640">
@@ -118,6 +144,8 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>166.179993</course>
   <speed>0.735656</speed>
   <name>WP0014</name>
+  <fix>3d</fix>
+  <sat>4</sat>
   <pdop>3.800000</pdop>
 </trkpt>
 <trkpt lat="45.492294984" lon="-75.717593307">
@@ -126,6 +154,7 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>114.070000</course>
   <speed>1.507322</speed>
   <name>WP0015</name>
+  <sat>2</sat>
 </trkpt>
 <trkpt lat="45.491944984" lon="-75.717474974">
   <ele>43.400000</ele>
@@ -133,6 +162,8 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>79.120003</course>
   <speed>1.517611</speed>
   <name>WP0016</name>
+  <fix>3d</fix>
+  <sat>4</sat>
   <pdop>3.800000</pdop>
 </trkpt>
 <trkpt lat="45.491938318" lon="-75.717353307">
@@ -141,6 +172,8 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>65.169998</course>
   <speed>1.378711</speed>
   <name>WP0017</name>
+  <fix>dgps</fix>
+  <sat>6</sat>
   <pdop>1.600000</pdop>
 </trkpt>
 <trkpt lat="45.491969984" lon="-75.717238307">
@@ -149,6 +182,8 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>87.449997</course>
   <speed>1.260389</speed>
   <name>WP0018</name>
+  <fix>dgps</fix>
+  <sat>5</sat>
   <pdop>1.600000</pdop>
 </trkpt>
 <trkpt lat="45.491994984" lon="-75.717094974">
@@ -157,6 +192,8 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>88.230003</course>
   <speed>1.476456</speed>
   <name>WP0019</name>
+  <fix>dgps</fix>
+  <sat>5</sat>
   <pdop>1.600000</pdop>
 </trkpt>
 <trkpt lat="45.491996651" lon="-75.716914974">
@@ -165,6 +202,8 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>68.449997</course>
   <speed>1.558767</speed>
   <name>WP0020</name>
+  <fix>dgps</fix>
+  <sat>5</sat>
   <pdop>2.600000</pdop>
 </trkpt>
 <trkpt lat="45.492019984" lon="-75.716781640">
@@ -173,6 +212,8 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>140.080002</course>
   <speed>0.138900</speed>
   <name>WP0021</name>
+  <fix>dgps</fix>
+  <sat>5</sat>
   <pdop>2.600000</pdop>
 </trkpt>
 <trkpt lat="45.492071651" lon="-75.716738307">
@@ -181,6 +222,8 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>114.720001</course>
   <speed>0.195489</speed>
   <name>WP0022</name>
+  <fix>3d</fix>
+  <sat>4</sat>
   <pdop>4.000000</pdop>
 </trkpt>
 <trkpt lat="45.492071651" lon="-75.716736640">
@@ -189,6 +232,8 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>128.500000</course>
   <speed>0.169767</speed>
   <name>WP0023</name>
+  <fix>dgps</fix>
+  <sat>5</sat>
   <pdop>1.600000</pdop>
 </trkpt>
 <trkpt lat="45.492096651" lon="-75.716736640">
@@ -197,6 +242,8 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>0.890000</course>
   <speed>0.262367</speed>
   <name>WP0024</name>
+  <fix>3d</fix>
+  <sat>4</sat>
   <pdop>4.000000</pdop>
 </trkpt>
 <trkpt lat="45.492099984" lon="-75.716729974">
@@ -205,6 +252,8 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>214.169998</course>
   <speed>0.144044</speed>
   <name>WP0025</name>
+  <fix>3d</fix>
+  <sat>4</sat>
   <pdop>2.200000</pdop>
 </trkpt>
 <trkpt lat="45.492721651" lon="-75.718441640">
@@ -213,6 +262,8 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>156.059998</course>
   <speed>0.205778</speed>
   <name>WP0026</name>
+  <fix>3d</fix>
+  <sat>4</sat>
   <pdop>5.200000</pdop>
 </trkpt>
 <trkpt lat="45.492656651" lon="-75.718409974">
@@ -221,6 +272,8 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>136.899994</course>
   <speed>0.082311</speed>
   <name>WP0027</name>
+  <fix>3d</fix>
+  <sat>4</sat>
   <pdop>5.200000</pdop>
 </trkpt>
 <trkpt lat="45.492591651" lon="-75.718313307">
@@ -229,6 +282,8 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>151.399994</course>
   <speed>0.108033</speed>
   <name>WP0028</name>
+  <fix>2d</fix>
+  <sat>3</sat>
   <pdop>10.600000</pdop>
 </trkpt>
 <trkpt lat="45.492568318" lon="-75.718309974">
@@ -237,6 +292,8 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>0.000000</course>
   <speed>0.000000</speed>
   <name>WP0029</name>
+  <fix>3d</fix>
+  <sat>4</sat>
   <pdop>5.200000</pdop>
 </trkpt>
 <trkpt lat="45.492314984" lon="-75.718339974">
@@ -245,6 +302,8 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>0.000000</course>
   <speed>0.000000</speed>
   <name>WP0030</name>
+  <fix>2d</fix>
+  <sat>3</sat>
   <pdop>25.400000</pdop>
 </trkpt>
 <trkpt lat="45.491909984" lon="-75.718324974">
@@ -253,6 +312,8 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>0.000000</course>
   <speed>0.000000</speed>
   <name>WP0031</name>
+  <fix>2d</fix>
+  <sat>3</sat>
   <pdop>28.200001</pdop>
 </trkpt>
 <trkpt lat="45.492206651" lon="-75.718414974">
@@ -261,6 +322,8 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>157.210007</course>
   <speed>0.036011</speed>
   <name>WP0032</name>
+  <fix>2d</fix>
+  <sat>3</sat>
   <pdop>28.200001</pdop>
 </trkpt>
 <trkpt lat="45.492689984" lon="-75.718359974">
@@ -269,6 +332,8 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>31.549999</course>
   <speed>0.118322</speed>
   <name>WP0033</name>
+  <fix>dgps</fix>
+  <sat>5</sat>
   <pdop>1.800000</pdop>
 </trkpt>
 <trkpt lat="45.492691651" lon="-75.718408307">
@@ -277,6 +342,8 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>160.520004</course>
   <speed>1.044322</speed>
   <name>WP0034</name>
+  <fix>3d</fix>
+  <sat>4</sat>
   <pdop>2.000000</pdop>
 </trkpt>
 <trkpt lat="45.492601651" lon="-75.718438307">
@@ -285,6 +352,7 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>162.570007</course>
   <speed>0.102889</speed>
   <name>WP0035</name>
+  <sat>1</sat>
 </trkpt>
 <trkpt lat="45.492479984" lon="-75.718403307">
   <ele>54.200000</ele>
@@ -292,6 +360,8 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>66.839996</course>
   <speed>0.411556</speed>
   <name>WP0036</name>
+  <fix>3d</fix>
+  <sat>4</sat>
   <pdop>6.800000</pdop>
 </trkpt>
 <trkpt lat="45.492566651" lon="-75.718339974">
@@ -300,6 +370,8 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>0.000000</course>
   <speed>0.000000</speed>
   <name>WP0037</name>
+  <fix>3d</fix>
+  <sat>4</sat>
   <pdop>19.400000</pdop>
 </trkpt>
 <trkpt lat="45.492343318" lon="-75.722331640">
@@ -316,6 +388,8 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>0.000000</course>
   <speed>0.000000</speed>
   <name>WP0039</name>
+  <fix>3d</fix>
+  <sat>4</sat>
   <pdop>17.799999</pdop>
 </trkpt>
 <trkpt lat="45.492369984" lon="-75.722586640">
@@ -324,6 +398,8 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>51.320000</course>
   <speed>0.087456</speed>
   <name>WP0040</name>
+  <fix>dgps</fix>
+  <sat>7</sat>
   <pdop>1.000000</pdop>
 </trkpt>
 <trkpt lat="45.493596651" lon="-75.728018307">
@@ -332,6 +408,8 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>22.510000</course>
   <speed>0.092600</speed>
   <name>WP0041</name>
+  <fix>dgps</fix>
+  <sat>5</sat>
   <pdop>1.600000</pdop>
 </trkpt>
 <trkpt lat="45.492388318" lon="-75.731491640">
@@ -340,6 +418,8 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>272.899994</course>
   <speed>1.208944</speed>
   <name>WP0042</name>
+  <fix>dgps</fix>
+  <sat>7</sat>
   <pdop>1.000000</pdop>
 </trkpt>
 <trkpt lat="45.492379984" lon="-75.731639974">
@@ -348,6 +428,8 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>304.450012</course>
   <speed>1.188367</speed>
   <name>WP0043</name>
+  <fix>dgps</fix>
+  <sat>7</sat>
   <pdop>1.000000</pdop>
 </trkpt>
 <trkpt lat="45.492419984" lon="-75.731754974">
@@ -356,6 +438,8 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>321.899994</course>
   <speed>1.332411</speed>
   <name>WP0044</name>
+  <fix>dgps</fix>
+  <sat>6</sat>
   <pdop>1.400000</pdop>
 </trkpt>
 <trkpt lat="45.492678318" lon="-75.732136640">
@@ -364,6 +448,8 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>346.209991</course>
   <speed>0.853978</speed>
   <name>WP0045</name>
+  <fix>dgps</fix>
+  <sat>6</sat>
   <pdop>1.400000</pdop>
 </trkpt>
 <trkpt lat="45.492764984" lon="-75.732181640">
@@ -372,6 +458,8 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>31.530001</course>
   <speed>0.041156</speed>
   <name>WP0046</name>
+  <fix>dgps</fix>
+  <sat>6</sat>
   <pdop>1.400000</pdop>
 </trkpt>
 <trkpt lat="45.493056651" lon="-75.734448307">
@@ -380,6 +468,8 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>124.980003</course>
   <speed>0.807678</speed>
   <name>WP0047</name>
+  <fix>dgps</fix>
+  <sat>6</sat>
   <pdop>1.200000</pdop>
 </trkpt>
 <trkpt lat="45.492984984" lon="-75.734376640">
@@ -388,6 +478,8 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>301.549988</course>
   <speed>1.301544</speed>
   <name>WP0048</name>
+  <fix>dgps</fix>
+  <sat>6</sat>
   <pdop>1.200000</pdop>
 </trkpt>
 <trkpt lat="45.493048318" lon="-75.734484974">
@@ -396,6 +488,8 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>312.899994</course>
   <speed>0.488722</speed>
   <name>WP0049</name>
+  <fix>dgps</fix>
+  <sat>7</sat>
   <pdop>1.000000</pdop>
 </trkpt>
 <trkpt lat="45.493248318" lon="-75.734873307">
@@ -404,6 +498,8 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>54.860001</course>
   <speed>0.077167</speed>
   <name>WP0050</name>
+  <fix>dgps</fix>
+  <sat>8</sat>
   <pdop>1.000000</pdop>
 </trkpt>
 <trkpt lat="45.493511651" lon="-75.735343307">
@@ -412,6 +508,8 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>338.209991</course>
   <speed>1.821133</speed>
   <name>WP0051</name>
+  <fix>dgps</fix>
+  <sat>7</sat>
   <pdop>1.400000</pdop>
 </trkpt>
 <trkpt lat="45.494089984" lon="-75.736121640">
@@ -420,6 +518,7 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>300.459991</course>
   <speed>0.632767</speed>
   <name>WP0052</name>
+  <sat>2</sat>
 </trkpt>
 <trkpt lat="45.494091651" lon="-75.736254974">
   <ele>72.100000</ele>
@@ -427,6 +526,7 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>306.429993</course>
   <speed>1.059756</speed>
   <name>WP0053</name>
+  <sat>2</sat>
 </trkpt>
 <trkpt lat="45.494156651" lon="-75.736351640">
   <ele>72.700000</ele>
@@ -434,6 +534,8 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>284.540009</course>
   <speed>0.967156</speed>
   <name>WP0054</name>
+  <fix>2d</fix>
+  <sat>3</sat>
   <pdop>6.200000</pdop>
 </trkpt>
 <trkpt lat="45.494316651" lon="-75.736706640">
@@ -442,6 +544,7 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>310.510010</course>
   <speed>0.648200</speed>
   <name>WP0055</name>
+  <sat>2</sat>
 </trkpt>
 <trkpt lat="45.494326651" lon="-75.736839974">
   <ele>72.500000</ele>
@@ -449,6 +552,7 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>208.550003</course>
   <speed>0.529878</speed>
   <name>WP0056</name>
+  <sat>2</sat>
 </trkpt>
 <trkpt lat="45.494348318" lon="-75.737104974">
   <ele>73.000000</ele>
@@ -456,6 +560,7 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>292.980011</course>
   <speed>1.574200</speed>
   <name>WP0057</name>
+  <sat>2</sat>
 </trkpt>
 <trkpt lat="45.494411651" lon="-75.737268307">
   <ele>73.300000</ele>
@@ -463,6 +568,8 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>348.260010</course>
   <speed>1.409578</speed>
   <name>WP0058</name>
+  <fix>2d</fix>
+  <sat>3</sat>
   <pdop>19.400000</pdop>
 </trkpt>
 <trkpt lat="45.494488318" lon="-75.737228307">
@@ -471,6 +578,8 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>357.940002</course>
   <speed>1.352989</speed>
   <name>WP0059</name>
+  <fix>2d</fix>
+  <sat>3</sat>
   <pdop>6.000000</pdop>
 </trkpt>
 <trkpt lat="45.494713318" lon="-75.737163307">
@@ -479,6 +588,8 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>341.100006</course>
   <speed>0.905422</speed>
   <name>WP0060</name>
+  <fix>3d</fix>
+  <sat>4</sat>
   <pdop>4.200000</pdop>
 </trkpt>
 <trkpt lat="45.494818318" lon="-75.737188307">
@@ -487,6 +598,8 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>11.500000</course>
   <speed>0.216067</speed>
   <name>WP0061</name>
+  <fix>3d</fix>
+  <sat>4</sat>
   <pdop>4.200000</pdop>
 </trkpt>
 <trkpt lat="45.495011651" lon="-75.737183307">
@@ -495,6 +608,8 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>26.420000</course>
   <speed>0.807678</speed>
   <name>WP0062</name>
+  <fix>3d</fix>
+  <sat>4</sat>
   <pdop>12.400000</pdop>
 </trkpt>
 <trkpt lat="45.495254984" lon="-75.737171640">
@@ -503,6 +618,8 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>37.529999</course>
   <speed>1.188367</speed>
   <name>WP0063</name>
+  <fix>3d</fix>
+  <sat>4</sat>
   <pdop>4.200000</pdop>
 </trkpt>
 <trkpt lat="45.495354984" lon="-75.737114974">
@@ -511,6 +628,8 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>48.630001</course>
   <speed>1.527900</speed>
   <name>WP0064</name>
+  <fix>dgps</fix>
+  <sat>6</sat>
   <pdop>1.600000</pdop>
 </trkpt>
 <trkpt lat="45.495581651" lon="-75.736874974">
@@ -519,6 +638,8 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>26.750000</course>
   <speed>1.059756</speed>
   <name>WP0065</name>
+  <fix>dgps</fix>
+  <sat>5</sat>
   <pdop>2.800000</pdop>
 </trkpt>
 <trkpt lat="45.495921651" lon="-75.736509974">
@@ -527,6 +648,8 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>201.380005</course>
   <speed>0.843689</speed>
   <name>WP0066</name>
+  <fix>dgps</fix>
+  <sat>5</sat>
   <pdop>1.800000</pdop>
 </trkpt>
 <trkpt lat="45.495844984" lon="-75.736588307">
@@ -535,6 +658,8 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>117.099998</course>
   <speed>0.457856</speed>
   <name>WP0067</name>
+  <fix>dgps</fix>
+  <sat>5</sat>
   <pdop>1.600000</pdop>
 </trkpt>
 <trkpt lat="45.495876651" lon="-75.736471640">
@@ -543,6 +668,8 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>130.149994</course>
   <speed>0.149189</speed>
   <name>WP0068</name>
+  <fix>2d</fix>
+  <sat>3</sat>
   <pdop>5.200000</pdop>
 </trkpt>
 <trkpt lat="45.495916651" lon="-75.736536640">
@@ -551,6 +678,8 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>129.250000</course>
   <speed>0.313811</speed>
   <name>WP0069</name>
+  <fix>3d</fix>
+  <sat>4</sat>
   <pdop>4.000000</pdop>
 </trkpt>
 <trkpt lat="45.495866651" lon="-75.736521640">
@@ -559,6 +688,8 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>87.769997</course>
   <speed>0.061733</speed>
   <name>WP0070</name>
+  <fix>3d</fix>
+  <sat>4</sat>
   <pdop>4.000000</pdop>
 </trkpt>
 <trkpt lat="45.496203318" lon="-75.734848307">
@@ -567,6 +698,8 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>164.850006</course>
   <speed>0.123467</speed>
   <name>WP0071</name>
+  <fix>3d</fix>
+  <sat>4</sat>
   <pdop>2.200000</pdop>
 </trkpt>
 <trkpt lat="45.496083318" lon="-75.734841640">
@@ -575,6 +708,8 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>244.000000</course>
   <speed>0.396122</speed>
   <name>WP0072</name>
+  <fix>2d</fix>
+  <sat>3</sat>
   <pdop>13.400000</pdop>
 </trkpt>
 <trkpt lat="45.496109984" lon="-75.734754974">
@@ -583,6 +718,8 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>86.839996</course>
   <speed>0.812822</speed>
   <name>WP0073</name>
+  <fix>dgps</fix>
+  <sat>5</sat>
   <pdop>1.600000</pdop>
 </trkpt>
 <trkpt lat="45.496299984" lon="-75.734379974">
@@ -591,6 +728,8 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>216.110001</course>
   <speed>0.118322</speed>
   <name>WP0074</name>
+  <fix>dgps</fix>
+  <sat>5</sat>
   <pdop>1.600000</pdop>
 </trkpt>
 <trkpt lat="45.496259984" lon="-75.734368307">
@@ -599,6 +738,7 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>250.699997</course>
   <speed>1.198656</speed>
   <name>WP0075</name>
+  <sat>2</sat>
 </trkpt>
 <trkpt lat="45.496204984" lon="-75.734474974">
   <ele>85.100000</ele>
@@ -606,6 +746,7 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>238.919998</course>
   <speed>1.656511</speed>
   <name>WP0076</name>
+  <sat>2</sat>
 </trkpt>
 <trkpt lat="45.496191651" lon="-75.734614974">
   <ele>85.600000</ele>
@@ -613,6 +754,8 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>235.460007</course>
   <speed>1.718244</speed>
   <name>WP0077</name>
+  <fix>2d</fix>
+  <sat>3</sat>
   <pdop>16.000000</pdop>
 </trkpt>
 <trkpt lat="45.496134984" lon="-75.734768307">
@@ -621,6 +764,7 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>248.250000</course>
   <speed>1.342700</speed>
   <name>WP0078</name>
+  <sat>2</sat>
 </trkpt>
 <trkpt lat="45.496108318" lon="-75.734911640">
   <ele>85.200000</ele>
@@ -628,6 +772,8 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>260.279999</course>
   <speed>0.992878</speed>
   <name>WP0079</name>
+  <fix>3d</fix>
+  <sat>4</sat>
   <pdop>2.400000</pdop>
 </trkpt>
 <trkpt lat="45.496044984" lon="-75.735079974">
@@ -636,6 +782,8 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>215.869995</course>
   <speed>1.270678</speed>
   <name>WP0080</name>
+  <fix>3d</fix>
+  <sat>4</sat>
   <pdop>3.200000</pdop>
 </trkpt>
 <trkpt lat="45.495993318" lon="-75.735166640">
@@ -644,6 +792,8 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>238.919998</course>
   <speed>1.095767</speed>
   <name>WP0081</name>
+  <fix>dgps</fix>
+  <sat>6</sat>
   <pdop>1.200000</pdop>
 </trkpt>
 <trkpt lat="45.495931651" lon="-75.735276640">
@@ -652,6 +802,8 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>235.889999</course>
   <speed>0.992878</speed>
   <name>WP0082</name>
+  <fix>3d</fix>
+  <sat>4</sat>
   <pdop>2.400000</pdop>
 </trkpt>
 <trkpt lat="45.495874984" lon="-75.735439974">
@@ -660,6 +812,8 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>228.059998</course>
   <speed>0.987733</speed>
   <name>WP0083</name>
+  <fix>dgps</fix>
+  <sat>5</sat>
   <pdop>1.400000</pdop>
 </trkpt>
 <trkpt lat="45.495826651" lon="-75.735561640">
@@ -668,6 +822,8 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>322.799988</course>
   <speed>1.152356</speed>
   <name>WP0084</name>
+  <fix>3d</fix>
+  <sat>4</sat>
   <pdop>2.000000</pdop>
 </trkpt>
 <trkpt lat="45.495858318" lon="-75.735689974">
@@ -676,6 +832,7 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>333.309998</course>
   <speed>0.468144</speed>
   <name>WP0085</name>
+  <sat>2</sat>
 </trkpt>
 <trkpt lat="45.495931651" lon="-75.735779974">
   <ele>74.000000</ele>
@@ -683,6 +840,8 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>154.389999</course>
   <speed>1.275822</speed>
   <name>WP0086</name>
+  <fix>2d</fix>
+  <sat>3</sat>
   <pdop>40.599998</pdop>
 </trkpt>
 <trkpt lat="45.495899984" lon="-75.735658307">
@@ -691,6 +850,8 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>197.889999</course>
   <speed>1.234667</speed>
   <name>WP0087</name>
+  <fix>3d</fix>
+  <sat>4</sat>
   <pdop>2.000000</pdop>
 </trkpt>
 <trkpt lat="45.495808318" lon="-75.735613307">
@@ -713,6 +874,8 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>272.200012</course>
   <speed>0.874556</speed>
   <name>WP0090</name>
+  <fix>2d</fix>
+  <sat>3</sat>
   <pdop>38.200001</pdop>
 </trkpt>
 <trkpt lat="45.495651651" lon="-75.735859974">
@@ -721,6 +884,7 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>214.550003</course>
   <speed>0.174911</speed>
   <name>WP0091</name>
+  <sat>2</sat>
 </trkpt>
 <trkpt lat="45.495756651" lon="-75.735824974">
   <ele>81.200000</ele>
@@ -728,6 +892,8 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>209.389999</course>
   <speed>0.216067</speed>
   <name>WP0092</name>
+  <fix>2d</fix>
+  <sat>3</sat>
   <pdop>37.200001</pdop>
 </trkpt>
 <trkpt lat="45.495728318" lon="-75.735801640">
@@ -736,6 +902,8 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>256.739990</course>
   <speed>0.673922</speed>
   <name>WP0093</name>
+  <fix>3d</fix>
+  <sat>4</sat>
   <pdop>9.400000</pdop>
 </trkpt>
 <trkpt lat="45.495708318" lon="-75.735911640">
@@ -744,6 +912,7 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>294.750000</course>
   <speed>0.817967</speed>
   <name>WP0094</name>
+  <sat>2</sat>
 </trkpt>
 <trkpt lat="45.495683318" lon="-75.736064974">
   <ele>64.000000</ele>
@@ -751,6 +920,7 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>174.509995</course>
   <speed>0.617333</speed>
   <name>WP0095</name>
+  <sat>1</sat>
 </trkpt>
 <trkpt lat="45.495584984" lon="-75.736138307">
   <ele>64.600000</ele>
@@ -758,6 +928,8 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>122.470001</course>
   <speed>0.720222</speed>
   <name>WP0096</name>
+  <fix>2d</fix>
+  <sat>3</sat>
   <pdop>23.000000</pdop>
 </trkpt>
 <trkpt lat="45.495651651" lon="-75.736043307">
@@ -766,6 +938,8 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>189.600006</course>
   <speed>0.128611</speed>
   <name>WP0097</name>
+  <fix>2d</fix>
+  <sat>3</sat>
   <pdop>5.200000</pdop>
 </trkpt>
 <trkpt lat="45.495691651" lon="-75.735939974">
@@ -774,6 +948,8 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>182.949997</course>
   <speed>0.108033</speed>
   <name>WP0098</name>
+  <fix>3d</fix>
+  <sat>4</sat>
   <pdop>43.599998</pdop>
 </trkpt>
 <trkpt lat="45.495706651" lon="-75.736066640">
@@ -782,6 +958,8 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>52.070000</course>
   <speed>0.164622</speed>
   <name>WP0099</name>
+  <fix>2d</fix>
+  <sat>3</sat>
   <pdop>24.200001</pdop>
 </trkpt>
 <trkpt lat="45.495733318" lon="-75.735924974">
@@ -790,6 +968,8 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>155.990005</course>
   <speed>0.113178</speed>
   <name>WP0100</name>
+  <fix>3d</fix>
+  <sat>4</sat>
   <pdop>2.200000</pdop>
 </trkpt>
 <trkpt lat="45.495666651" lon="-75.735996640">
@@ -798,6 +978,8 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>97.730003</course>
   <speed>1.111200</speed>
   <name>WP0101</name>
+  <fix>2d</fix>
+  <sat>3</sat>
   <pdop>36.400002</pdop>
 </trkpt>
 <trkpt lat="45.495646651" lon="-75.735903307">
@@ -806,6 +988,7 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>50.860001</course>
   <speed>1.625644</speed>
   <name>WP0102</name>
+  <sat>2</sat>
 </trkpt>
 <trkpt lat="45.495689984" lon="-75.735704974">
   <ele>74.700000</ele>
@@ -813,6 +996,8 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>44.029999</course>
   <speed>1.347844</speed>
   <name>WP0103</name>
+  <fix>2d</fix>
+  <sat>3</sat>
   <pdop>13.600000</pdop>
 </trkpt>
 <trkpt lat="45.495769984" lon="-75.735519974">
@@ -821,6 +1006,8 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>82.080002</course>
   <speed>0.715078</speed>
   <name>WP0104</name>
+  <fix>2d</fix>
+  <sat>3</sat>
   <pdop>50.000000</pdop>
 </trkpt>
 <trkpt lat="45.495858318" lon="-75.735479974">
@@ -829,6 +1016,8 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>80.239998</course>
   <speed>0.745944</speed>
   <name>WP0105</name>
+  <fix>2d</fix>
+  <sat>3</sat>
   <pdop>26.400000</pdop>
 </trkpt>
 <trkpt lat="45.495914984" lon="-75.735378307">
@@ -837,6 +1026,8 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>47.939999</course>
   <speed>1.733678</speed>
   <name>WP0106</name>
+  <fix>3d</fix>
+  <sat>4</sat>
   <pdop>50.000000</pdop>
 </trkpt>
 <trkpt lat="45.495991651" lon="-75.735234974">
@@ -845,6 +1036,8 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>62.310001</course>
   <speed>1.116344</speed>
   <name>WP0107</name>
+  <fix>dgps</fix>
+  <sat>5</sat>
   <pdop>1.600000</pdop>
 </trkpt>
 <trkpt lat="45.496076651" lon="-75.735043307">
@@ -853,6 +1046,7 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>59.770000</course>
   <speed>1.435300</speed>
   <name>WP0108</name>
+  <sat>2</sat>
 </trkpt>
 <trkpt lat="45.496214984" lon="-75.734634974">
   <ele>92.600000</ele>
@@ -860,6 +1054,8 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>57.660000</course>
   <speed>1.260389</speed>
   <name>WP0109</name>
+  <fix>dgps</fix>
+  <sat>5</sat>
   <pdop>2.000000</pdop>
 </trkpt>
 <trkpt lat="45.496243318" lon="-75.734476640">
@@ -868,6 +1064,8 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>55.730000</course>
   <speed>1.399289</speed>
   <name>WP0110</name>
+  <fix>3d</fix>
+  <sat>4</sat>
   <pdop>5.000000</pdop>
 </trkpt>
 <trkpt lat="45.496326651" lon="-75.734336640">
@@ -876,6 +1074,8 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>28.459999</course>
   <speed>1.286111</speed>
   <name>WP0111</name>
+  <fix>dgps</fix>
+  <sat>7</sat>
   <pdop>0.800000</pdop>
 </trkpt>
 <trkpt lat="45.496198318" lon="-75.734216640">
@@ -884,6 +1084,8 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>245.169998</course>
   <speed>0.972300</speed>
   <name>WP0112</name>
+  <fix>3d</fix>
+  <sat>4</sat>
   <pdop>9.400000</pdop>
 </trkpt>
 <trkpt lat="45.496179984" lon="-75.734338307">
@@ -892,6 +1094,8 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>240.100006</course>
   <speed>1.553622</speed>
   <name>WP0113</name>
+  <fix>2d</fix>
+  <sat>3</sat>
   <pdop>6.000000</pdop>
 </trkpt>
 <trkpt lat="45.496081651" lon="-75.734656640">
@@ -900,6 +1104,8 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>238.809998</course>
   <speed>1.265533</speed>
   <name>WP0114</name>
+  <fix>2d</fix>
+  <sat>3</sat>
   <pdop>7.600000</pdop>
 </trkpt>
 <trkpt lat="45.495996651" lon="-75.734781640">
@@ -908,6 +1114,8 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>242.740005</course>
   <speed>1.183222</speed>
   <name>WP0115</name>
+  <fix>3d</fix>
+  <sat>4</sat>
   <pdop>11.800000</pdop>
 </trkpt>
 <trkpt lat="45.495906651" lon="-75.734983307">
@@ -916,6 +1124,7 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>236.539993</course>
   <speed>1.003167</speed>
   <name>WP0116</name>
+  <sat>2</sat>
 </trkpt>
 <trkpt lat="45.495801651" lon="-75.735363307">
   <ele>43.700000</ele>
@@ -923,6 +1132,8 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>261.720001</course>
   <speed>1.713100</speed>
   <name>WP0117</name>
+  <fix>2d</fix>
+  <sat>3</sat>
   <pdop>7.200000</pdop>
 </trkpt>
 <trkpt lat="45.495801651" lon="-75.735514974">
@@ -931,6 +1142,7 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>298.739990</course>
   <speed>1.265533</speed>
   <name>WP0118</name>
+  <sat>2</sat>
 </trkpt>
 <trkpt lat="45.495833318" lon="-75.735654974">
   <ele>44.600000</ele>
@@ -938,6 +1150,8 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>313.660004</course>
   <speed>1.188367</speed>
   <name>WP0119</name>
+  <fix>3d</fix>
+  <sat>4</sat>
   <pdop>16.600000</pdop>
 </trkpt>
 <trkpt lat="45.495914984" lon="-75.735726640">
@@ -946,6 +1160,7 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>330.829987</course>
   <speed>1.347844</speed>
   <name>WP0120</name>
+  <sat>2</sat>
 </trkpt>
 <trkpt lat="45.495956651" lon="-75.735839974">
   <ele>43.000000</ele>
@@ -953,6 +1168,7 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>334.989990</course>
   <speed>1.198656</speed>
   <name>WP0121</name>
+  <sat>2</sat>
 </trkpt>
 <trkpt lat="45.496036651" lon="-75.735908307">
   <ele>42.000000</ele>
@@ -960,6 +1176,8 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>341.049988</course>
   <speed>1.687378</speed>
   <name>WP0122</name>
+  <fix>2d</fix>
+  <sat>3</sat>
   <pdop>7.200000</pdop>
 </trkpt>
 <trkpt lat="45.496151651" lon="-75.735971640">
@@ -968,6 +1186,8 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>1.620000</course>
   <speed>1.594778</speed>
   <name>WP0123</name>
+  <fix>2d</fix>
+  <sat>3</sat>
   <pdop>6.800000</pdop>
 </trkpt>
 <trkpt lat="45.496328318" lon="-75.735998307">
@@ -976,6 +1196,8 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>18.180000</course>
   <speed>1.106055</speed>
   <name>WP0124</name>
+  <fix>2d</fix>
+  <sat>3</sat>
   <pdop>6.800000</pdop>
 </trkpt>
 <trkpt lat="45.496431651" lon="-75.735963307">
@@ -984,6 +1206,7 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>10.700000</course>
   <speed>1.311833</speed>
   <name>WP0125</name>
+  <sat>1</sat>
 </trkpt>
 <trkpt lat="45.496608318" lon="-75.735874974">
   <ele>41.600000</ele>
@@ -991,6 +1214,8 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>333.260010</course>
   <speed>0.766522</speed>
   <name>WP0126</name>
+  <fix>2d</fix>
+  <sat>3</sat>
   <pdop>7.000000</pdop>
 </trkpt>
 <trkpt lat="45.496763318" lon="-75.735828307">
@@ -999,6 +1224,7 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>348.489990</course>
   <speed>1.126633</speed>
   <name>WP0127</name>
+  <sat>2</sat>
 </trkpt>
 <trkpt lat="45.496854984" lon="-75.735886640">
   <ele>41.600000</ele>
@@ -1006,6 +1232,7 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>335.130005</course>
   <speed>1.106055</speed>
   <name>WP0128</name>
+  <sat>2</sat>
 </trkpt>
 <trkpt lat="45.496996651" lon="-75.735931640">
   <ele>41.600000</ele>
@@ -1013,6 +1240,7 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>356.950012</course>
   <speed>1.733678</speed>
   <name>WP0129</name>
+  <sat>2</sat>
 </trkpt>
 <trkpt lat="45.497081651" lon="-75.735889974">
   <ele>41.600000</ele>
@@ -1020,6 +1248,7 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>344.679993</course>
   <speed>0.977444</speed>
   <name>WP0130</name>
+  <sat>2</sat>
 </trkpt>
 <trkpt lat="45.497164984" lon="-75.735838307">
   <ele>41.600000</ele>
@@ -1027,6 +1256,7 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>69.209999</course>
   <speed>1.239811</speed>
   <name>WP0131</name>
+  <sat>1</sat>
 </trkpt>
 <trkpt lat="45.497229984" lon="-75.735719974">
   <ele>41.600000</ele>
@@ -1034,6 +1264,8 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>83.389999</course>
   <speed>1.491889</speed>
   <name>WP0132</name>
+  <fix>2d</fix>
+  <sat>3</sat>
   <pdop>7.400000</pdop>
 </trkpt>
 <trkpt lat="45.497303318" lon="-75.735568307">
@@ -1042,6 +1274,8 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>93.379997</course>
   <speed>1.569056</speed>
   <name>WP0133</name>
+  <fix>3d</fix>
+  <sat>4</sat>
   <pdop>33.799999</pdop>
 </trkpt>
 <trkpt lat="45.497301651" lon="-75.735439974">
@@ -1050,6 +1284,8 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>105.099998</course>
   <speed>1.831422</speed>
   <name>WP0134</name>
+  <fix>2d</fix>
+  <sat>3</sat>
   <pdop>6.800000</pdop>
 </trkpt>
 <trkpt lat="45.497318318" lon="-75.735193307">
@@ -1058,6 +1294,7 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>63.990002</course>
   <speed>1.373567</speed>
   <name>WP0135</name>
+  <sat>2</sat>
 </trkpt>
 <trkpt lat="45.497329984" lon="-75.734973307">
   <ele>42.300000</ele>
@@ -1065,6 +1302,8 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>67.769997</course>
   <speed>1.769689</speed>
   <name>WP0136</name>
+  <fix>3d</fix>
+  <sat>4</sat>
   <pdop>21.799999</pdop>
 </trkpt>
 <trkpt lat="45.497464984" lon="-75.733798307">
@@ -1073,6 +1312,8 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>108.410004</course>
   <speed>1.358133</speed>
   <name>WP0137</name>
+  <fix>2d</fix>
+  <sat>3</sat>
   <pdop>7.000000</pdop>
 </trkpt>
 <trkpt lat="45.497519984" lon="-75.733038307">
@@ -1081,6 +1322,8 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>104.510002</course>
   <speed>1.219233</speed>
   <name>WP0138</name>
+  <fix>2d</fix>
+  <sat>3</sat>
   <pdop>8.400000</pdop>
 </trkpt>
 <trkpt lat="45.497474984" lon="-75.732808307">
@@ -1089,6 +1332,8 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>260.720001</course>
   <speed>1.023744</speed>
   <name>WP0139</name>
+  <fix>2d</fix>
+  <sat>3</sat>
   <pdop>8.600000</pdop>
 </trkpt>
 <trkpt lat="45.497466651" lon="-75.732938307">
@@ -1097,6 +1342,7 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>274.910004</course>
   <speed>1.399289</speed>
   <name>WP0140</name>
+  <sat>2</sat>
 </trkpt>
 <trkpt lat="45.497506651" lon="-75.733146640">
   <ele>49.000000</ele>
@@ -1111,6 +1357,7 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>174.869995</course>
   <speed>0.504156</speed>
   <name>WP0142</name>
+  <sat>2</sat>
 </trkpt>
 <trkpt lat="45.497463318" lon="-75.733511640">
   <ele>49.900000</ele>
@@ -1118,6 +1365,8 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>223.550003</course>
   <speed>0.838544</speed>
   <name>WP0143</name>
+  <fix>3d</fix>
+  <sat>4</sat>
   <pdop>8.200000</pdop>
 </trkpt>
 <trkpt lat="45.497483318" lon="-75.733636640">
@@ -1126,6 +1375,8 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>255.070007</course>
   <speed>1.244956</speed>
   <name>WP0144</name>
+  <fix>2d</fix>
+  <sat>3</sat>
   <pdop>6.400000</pdop>
 </trkpt>
 <trkpt lat="45.497466651" lon="-75.733898307">
@@ -1134,6 +1385,8 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>267.149994</course>
   <speed>1.080333</speed>
   <name>WP0145</name>
+  <fix>2d</fix>
+  <sat>3</sat>
   <pdop>9.400000</pdop>
 </trkpt>
 <trkpt lat="45.497471651" lon="-75.734046640">
@@ -1142,6 +1395,8 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>158.740005</course>
   <speed>0.761378</speed>
   <name>WP0146</name>
+  <fix>2d</fix>
+  <sat>3</sat>
   <pdop>5.400000</pdop>
 </trkpt>
 <trkpt lat="45.497383318" lon="-75.734076640">
@@ -1150,6 +1405,8 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>233.080002</course>
   <speed>1.121489</speed>
   <name>WP0147</name>
+  <fix>2d</fix>
+  <sat>3</sat>
   <pdop>10.000000</pdop>
 </trkpt>
 <trkpt lat="45.497269984" lon="-75.734148307">
@@ -1158,6 +1415,7 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>150.190002</course>
   <speed>0.169767</speed>
   <name>WP0148</name>
+  <sat>2</sat>
 </trkpt>
 <trkpt lat="45.497241651" lon="-75.734263307">
   <ele>70.600000</ele>
@@ -1165,6 +1423,8 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>155.179993</course>
   <speed>0.915711</speed>
   <name>WP0149</name>
+  <fix>3d</fix>
+  <sat>4</sat>
   <pdop>5.200000</pdop>
 </trkpt>
 <trkpt lat="45.497159984" lon="-75.734243307">
@@ -1173,6 +1433,8 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>137.089996</course>
   <speed>0.571033</speed>
   <name>WP0150</name>
+  <fix>3d</fix>
+  <sat>4</sat>
   <pdop>5.000000</pdop>
 </trkpt>
 <trkpt lat="45.497066651" lon="-75.734216640">
@@ -1181,6 +1443,8 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>356.690002</course>
   <speed>0.226356</speed>
   <name>WP0151</name>
+  <fix>2d</fix>
+  <sat>3</sat>
   <pdop>10.600000</pdop>
 </trkpt>
 <trkpt lat="45.496981651" lon="-75.734176640">
@@ -1189,6 +1453,8 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>233.190002</course>
   <speed>0.926000</speed>
   <name>WP0152</name>
+  <fix>2d</fix>
+  <sat>3</sat>
   <pdop>6.400000</pdop>
 </trkpt>
 <trkpt lat="45.497001651" lon="-75.734269974">
@@ -1197,6 +1463,7 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>66.459999</course>
   <speed>1.075189</speed>
   <name>WP0153</name>
+  <sat>1</sat>
 </trkpt>
 <trkpt lat="45.497056651" lon="-75.734181640">
   <ele>90.200000</ele>
@@ -1204,6 +1471,7 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>285.640015</course>
   <speed>0.853978</speed>
   <name>WP0154</name>
+  <sat>2</sat>
 </trkpt>
 <trkpt lat="45.497098318" lon="-75.734301640">
   <ele>93.200000</ele>
@@ -1211,6 +1479,7 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>250.550003</course>
   <speed>1.214089</speed>
   <name>WP0155</name>
+  <sat>2</sat>
 </trkpt>
 <trkpt lat="45.497131651" lon="-75.734461640">
   <ele>94.400000</ele>
@@ -1218,6 +1487,8 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>245.679993</course>
   <speed>1.100911</speed>
   <name>WP0156</name>
+  <fix>2d</fix>
+  <sat>3</sat>
   <pdop>6.400000</pdop>
 </trkpt>
 <trkpt lat="45.497083318" lon="-75.734576640">
@@ -1226,6 +1497,7 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>244.559998</course>
   <speed>1.188367</speed>
   <name>WP0157</name>
+  <sat>2</sat>
 </trkpt>
 <trkpt lat="45.497011651" lon="-75.734718307">
   <ele>96.500000</ele>
@@ -1233,6 +1505,8 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>262.299988</course>
   <speed>1.671944</speed>
   <name>WP0158</name>
+  <fix>2d</fix>
+  <sat>3</sat>
   <pdop>6.200000</pdop>
 </trkpt>
 <trkpt lat="45.497041651" lon="-75.734841640">
@@ -1241,6 +1515,7 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>207.820007</course>
   <speed>1.070044</speed>
   <name>WP0159</name>
+  <sat>2</sat>
 </trkpt>
 <trkpt lat="45.496978318" lon="-75.734936640">
   <ele>97.000000</ele>
@@ -1248,6 +1523,8 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>269.070007</course>
   <speed>1.404433</speed>
   <name>WP0160</name>
+  <fix>2d</fix>
+  <sat>3</sat>
   <pdop>6.200000</pdop>
 </trkpt>
 <trkpt lat="45.496954984" lon="-75.735069974">
@@ -1256,6 +1533,7 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>229.419998</course>
   <speed>0.982589</speed>
   <name>WP0161</name>
+  <sat>2</sat>
 </trkpt>
 <trkpt lat="45.496956651" lon="-75.735244974">
   <ele>98.200000</ele>
@@ -1263,6 +1541,8 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>242.610001</course>
   <speed>0.730511</speed>
   <name>WP0162</name>
+  <fix>2d</fix>
+  <sat>3</sat>
   <pdop>6.200000</pdop>
 </trkpt>
 <trkpt lat="45.496894984" lon="-75.735343307">
@@ -1271,6 +1551,8 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>220.550003</course>
   <speed>1.497033</speed>
   <name>WP0163</name>
+  <fix>2d</fix>
+  <sat>3</sat>
   <pdop>6.200000</pdop>
 </trkpt>
 <trkpt lat="45.496828318" lon="-75.735484974">
@@ -1279,6 +1561,7 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>237.889999</course>
   <speed>1.106055</speed>
   <name>WP0164</name>
+  <sat>2</sat>
 </trkpt>
 <trkpt lat="45.496764984" lon="-75.735634974">
   <ele>98.200000</ele>
@@ -1286,6 +1569,8 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>253.720001</course>
   <speed>1.445589</speed>
   <name>WP0165</name>
+  <fix>2d</fix>
+  <sat>3</sat>
   <pdop>6.200000</pdop>
 </trkpt>
 <trkpt lat="45.496698318" lon="-75.735818307">
@@ -1294,6 +1579,8 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>224.910004</course>
   <speed>2.515633</speed>
   <name>WP0166</name>
+  <fix>2d</fix>
+  <sat>3</sat>
   <pdop>6.200000</pdop>
 </trkpt>
 <trkpt lat="45.496658318" lon="-75.735986640">
@@ -1302,6 +1589,8 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>204.449997</course>
   <speed>2.459044</speed>
   <name>WP0167</name>
+  <fix>2d</fix>
+  <sat>3</sat>
   <pdop>13.400000</pdop>
 </trkpt>
 <trkpt lat="45.496573318" lon="-75.736061640">
@@ -1310,6 +1599,8 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>185.449997</course>
   <speed>2.165811</speed>
   <name>WP0168</name>
+  <fix>3d</fix>
+  <sat>4</sat>
   <pdop>3.200000</pdop>
 </trkpt>
 <trkpt lat="45.496441651" lon="-75.736114974">
@@ -1318,6 +1609,8 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>157.490005</course>
   <speed>2.021767</speed>
   <name>WP0169</name>
+  <fix>2d</fix>
+  <sat>3</sat>
   <pdop>13.400000</pdop>
 </trkpt>
 <trkpt lat="45.496343318" lon="-75.736063307">
@@ -1326,6 +1619,8 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>137.639999</course>
   <speed>1.764544</speed>
   <name>WP0170</name>
+  <fix>2d</fix>
+  <sat>3</sat>
   <pdop>13.600000</pdop>
 </trkpt>
 <trkpt lat="45.495934984" lon="-75.735669974">
@@ -1334,6 +1629,8 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>83.290001</course>
   <speed>1.455878</speed>
   <name>WP0171</name>
+  <fix>2d</fix>
+  <sat>3</sat>
   <pdop>8.800000</pdop>
 </trkpt>
 <trkpt lat="45.495949984" lon="-75.735524974">
@@ -1342,6 +1639,8 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>86.800003</course>
   <speed>0.895133</speed>
   <name>WP0172</name>
+  <fix>3d</fix>
+  <sat>4</sat>
   <pdop>3.000000</pdop>
 </trkpt>
 <trkpt lat="45.495986651" lon="-75.735344974">
@@ -1350,6 +1649,8 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>79.180000</course>
   <speed>0.828256</speed>
   <name>WP0173</name>
+  <fix>3d</fix>
+  <sat>4</sat>
   <pdop>3.000000</pdop>
 </trkpt>
 <trkpt lat="45.496024984" lon="-75.735221640">
@@ -1358,6 +1659,8 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>82.589996</course>
   <speed>0.766522</speed>
   <name>WP0174</name>
+  <fix>2d</fix>
+  <sat>3</sat>
   <pdop>6.200000</pdop>
 </trkpt>
 <trkpt lat="45.496096651" lon="-75.734986640">
@@ -1366,6 +1669,8 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>67.809998</course>
   <speed>0.956867</speed>
   <name>WP0175</name>
+  <fix>3d</fix>
+  <sat>4</sat>
   <pdop>2.800000</pdop>
 </trkpt>
 <trkpt lat="45.496131651" lon="-75.734836640">
@@ -1374,6 +1679,8 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>43.900002</course>
   <speed>1.260389</speed>
   <name>WP0176</name>
+  <fix>3d</fix>
+  <sat>4</sat>
   <pdop>2.800000</pdop>
 </trkpt>
 <trkpt lat="45.496186651" lon="-75.734716640">
@@ -1382,6 +1689,8 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>81.980003</course>
   <speed>1.142067</speed>
   <name>WP0177</name>
+  <fix>2d</fix>
+  <sat>3</sat>
   <pdop>9.000000</pdop>
 </trkpt>
 <trkpt lat="45.496241651" lon="-75.734586640">
@@ -1390,6 +1699,8 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>109.800003</course>
   <speed>0.056589</speed>
   <name>WP0178</name>
+  <fix>3d</fix>
+  <sat>4</sat>
   <pdop>2.800000</pdop>
 </trkpt>
 <trkpt lat="45.496301651" lon="-75.734363307">
@@ -1398,6 +1709,8 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>206.750000</course>
   <speed>0.627622</speed>
   <name>WP0179</name>
+  <fix>2d</fix>
+  <sat>3</sat>
   <pdop>9.200000</pdop>
 </trkpt>
 <trkpt lat="45.496216651" lon="-75.734409974">
@@ -1406,6 +1719,7 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>186.479996</course>
   <speed>0.735656</speed>
   <name>WP0180</name>
+  <sat>1</sat>
 </trkpt>
 <trkpt lat="45.496306651" lon="-75.734371640">
   <ele>98.800000</ele>
@@ -1413,6 +1727,8 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>185.270004</course>
   <speed>0.483578</speed>
   <name>WP0181</name>
+  <fix>3d</fix>
+  <sat>4</sat>
   <pdop>2.600000</pdop>
 </trkpt>
 <trkpt lat="45.496194984" lon="-75.734224974">
@@ -1421,6 +1737,8 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>166.690002</course>
   <speed>6.152756</speed>
   <name>WP0182</name>
+  <fix>2d</fix>
+  <sat>3</sat>
   <pdop>9.600000</pdop>
 </trkpt>
 <trkpt lat="45.495998318" lon="-75.734101640">
@@ -1429,6 +1747,7 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>166.690002</course>
   <speed>6.152756</speed>
   <name>WP0183</name>
+  <sat>1</sat>
 </trkpt>
 <trkpt lat="45.494281651" lon="-75.733509974">
   <ele>97.300000</ele>
@@ -1443,6 +1762,7 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>131.520004</course>
   <speed>24.652178</speed>
   <name>WP0185</name>
+  <sat>2</sat>
 </trkpt>
 <trkpt lat="45.490809984" lon="-75.728584974">
   <ele>97.700000</ele>
@@ -1450,6 +1770,7 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>135.419998</course>
   <speed>23.268322</speed>
   <name>WP0186</name>
+  <sat>2</sat>
 </trkpt>
 <trkpt lat="45.489388318" lon="-75.725018307">
   <ele>98.100000</ele>
@@ -1457,6 +1778,7 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>144.899994</course>
   <speed>21.025345</speed>
   <name>WP0187</name>
+  <sat>2</sat>
 </trkpt>
 <trkpt lat="45.488314984" lon="-75.722894974">
   <ele>98.200000</ele>
@@ -1464,6 +1786,7 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>147.210007</course>
   <speed>20.654945</speed>
   <name>WP0188</name>
+  <sat>2</sat>
 </trkpt>
 <trkpt lat="45.487204984" lon="-75.721489974">
   <ele>98.200000</ele>
@@ -1478,6 +1801,7 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>160.369995</course>
   <speed>15.068078</speed>
   <name>WP0190</name>
+  <sat>2</sat>
 </trkpt>
 <trkpt lat="45.488398318" lon="-75.721109974">
   <ele>97.800000</ele>
@@ -1485,6 +1809,7 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>182.169998</course>
   <speed>9.877334</speed>
   <name>WP0191</name>
+  <sat>1</sat>
 </trkpt>
 <trkpt lat="45.490408318" lon="-75.722254974">
   <ele>101.300000</ele>
@@ -1492,6 +1817,7 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>174.380005</course>
   <speed>7.963600</speed>
   <name>WP0192</name>
+  <sat>2</sat>
 </trkpt>
 <trkpt lat="45.491743318" lon="-75.723359974">
   <ele>105.300000</ele>
@@ -1499,6 +1825,8 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>179.320007</course>
   <speed>8.323711</speed>
   <name>WP0193</name>
+  <fix>2d</fix>
+  <sat>3</sat>
   <pdop>10.000000</pdop>
 </trkpt>
 <trkpt lat="45.491659984" lon="-75.723431640">
@@ -1507,6 +1835,7 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>183.029999</course>
   <speed>8.267122</speed>
   <name>WP0194</name>
+  <sat>2</sat>
 </trkpt>
 <trkpt lat="45.491213318" lon="-75.723554974">
   <ele>105.700000</ele>
@@ -1514,6 +1843,7 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>183.029999</course>
   <speed>8.267122</speed>
   <name>WP0195</name>
+  <sat>1</sat>
 </trkpt>
 <trkpt lat="45.490278318" lon="-75.723608307">
   <ele>104.700000</ele>
@@ -1521,6 +1851,7 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>126.190002</course>
   <speed>4.876933</speed>
   <name>WP0196</name>
+  <sat>2</sat>
 </trkpt>
 <trkpt lat="45.490369984" lon="-75.723388307">
   <ele>103.600000</ele>
@@ -1528,6 +1859,7 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>83.410004</course>
   <speed>14.347856</speed>
   <name>WP0197</name>
+  <sat>2</sat>
 </trkpt>
 <trkpt lat="45.490526651" lon="-75.721809974">
   <ele>101.300000</ele>
@@ -1535,6 +1867,7 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>84.290001</course>
   <speed>13.828267</speed>
   <name>WP0198</name>
+  <sat>2</sat>
 </trkpt>
 <trkpt lat="45.490071651" lon="-75.720394974">
   <ele>99.900000</ele>
@@ -1542,6 +1875,8 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>109.540001</course>
   <speed>15.947778</speed>
   <name>WP0199</name>
+  <fix>2d</fix>
+  <sat>3</sat>
   <pdop>2.600000</pdop>
 </trkpt>
 <trkpt lat="45.488781651" lon="-75.717853307">
@@ -1550,6 +1885,7 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>115.199997</course>
   <speed>14.759411</speed>
   <name>WP0200</name>
+  <sat>1</sat>
 </trkpt>
 <trkpt lat="45.488024984" lon="-75.715301640">
   <ele>97.900000</ele>
@@ -1557,6 +1893,7 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>105.970001</course>
   <speed>16.909788</speed>
   <name>WP0201</name>
+  <sat>2</sat>
 </trkpt>
 <trkpt lat="45.487381651" lon="-75.712531640">
   <ele>97.700000</ele>
@@ -1564,6 +1901,7 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>105.970001</course>
   <speed>16.909788</speed>
   <name>WP0202</name>
+  <sat>1</sat>
 </trkpt>
 <trkpt lat="45.487396651" lon="-75.711828307">
   <ele>97.700000</ele>
@@ -1571,6 +1909,7 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>87.070000</course>
   <speed>14.203811</speed>
   <name>WP0203</name>
+  <sat>2</sat>
 </trkpt>
 <trkpt lat="45.487534984" lon="-75.711744974">
   <ele>97.700000</ele>
@@ -1578,6 +1917,7 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>85.029999</course>
   <speed>14.121500</speed>
   <name>WP0204</name>
+  <sat>2</sat>
 </trkpt>
 <trkpt lat="45.487728318" lon="-75.711471640">
   <ele>97.500000</ele>
@@ -1585,6 +1925,7 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>84.540001</course>
   <speed>18.633179</speed>
   <name>WP0205</name>
+  <sat>2</sat>
 </trkpt>
 <trkpt lat="45.487859984" lon="-75.710994974">
   <ele>97.300000</ele>
@@ -1592,6 +1933,7 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>84.480003</course>
   <speed>19.055021</speed>
   <name>WP0206</name>
+  <sat>2</sat>
 </trkpt>
 <trkpt lat="45.488128318" lon="-75.708784974">
   <ele>97.100000</ele>
@@ -1599,6 +1941,7 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>84.480003</course>
   <speed>19.055021</speed>
   <name>WP0207</name>
+  <sat>1</sat>
 </trkpt>
 <trkpt lat="45.488351651" lon="-75.705628307">
   <ele>97.000000</ele>
@@ -1606,6 +1949,7 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>84.480003</course>
   <speed>19.055021</speed>
   <name>WP0208</name>
+  <sat>1</sat>
 </trkpt>
 <trkpt lat="45.488748318" lon="-75.704488307">
   <ele>97.100000</ele>
@@ -1613,6 +1957,8 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>86.349998</course>
   <speed>7.526322</speed>
   <name>WP0209</name>
+  <fix>2d</fix>
+  <sat>3</sat>
   <pdop>6.400000</pdop>
 </trkpt>
 <trkpt lat="45.489294984" lon="-75.703023307">
@@ -1621,6 +1967,8 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>103.959999</course>
   <speed>0.164622</speed>
   <name>WP0210</name>
+  <fix>2d</fix>
+  <sat>3</sat>
   <pdop>6.400000</pdop>
 </trkpt>
 <trkpt lat="45.489278318" lon="-75.703171640">
@@ -1629,6 +1977,8 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>198.320007</course>
   <speed>0.174911</speed>
   <name>WP0211</name>
+  <fix>2d</fix>
+  <sat>3</sat>
   <pdop>6.400000</pdop>
 </trkpt>
 <trkpt lat="45.489263318" lon="-75.703306640">
@@ -1637,6 +1987,7 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>2.360000</course>
   <speed>0.920856</speed>
   <name>WP0212</name>
+  <sat>1</sat>
 </trkpt>
 <trkpt lat="45.489364984" lon="-75.702803307">
   <ele>96.900000</ele>
@@ -1644,6 +1995,7 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>81.510002</course>
   <speed>14.769700</speed>
   <name>WP0213</name>
+  <sat>2</sat>
 </trkpt>
 <trkpt lat="45.489553318" lon="-75.700098307">
   <ele>97.300000</ele>
@@ -1658,6 +2010,8 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>90.029999</course>
   <speed>1.450733</speed>
   <name>WP0215</name>
+  <fix>2d</fix>
+  <sat>3</sat>
   <pdop>6.400000</pdop>
 </trkpt>
 <trkpt lat="45.489766651" lon="-75.698538307">
@@ -1666,6 +2020,7 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>91.970001</course>
   <speed>1.430156</speed>
   <name>WP0216</name>
+  <sat>2</sat>
 </trkpt>
 <trkpt lat="45.489761651" lon="-75.698398307">
   <ele>97.100000</ele>
@@ -1673,6 +2028,7 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>93.570000</course>
   <speed>15.705989</speed>
   <name>WP0217</name>
+  <sat>1</sat>
 </trkpt>
 <trkpt lat="45.489583318" lon="-75.695093307">
   <ele>97.400000</ele>
@@ -1687,6 +2043,7 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>76.129997</course>
   <speed>14.399300</speed>
   <name>WP0219</name>
+  <sat>2</sat>
 </trkpt>
 <trkpt lat="45.489909984" lon="-75.693386640">
   <ele>97.500000</ele>
@@ -1694,6 +2051,7 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>75.209999</course>
   <speed>14.574211</speed>
   <name>WP0220</name>
+  <sat>1</sat>
 </trkpt>
 <trkpt lat="45.490408318" lon="-75.692841640">
   <ele>97.500000</ele>
@@ -1701,6 +2059,7 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>75.209999</course>
   <speed>14.574211</speed>
   <name>WP0221</name>
+  <sat>1</sat>
 </trkpt>
 <trkpt lat="45.490608318" lon="-75.692348307">
   <ele>97.400000</ele>
@@ -1708,6 +2067,7 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>75.209999</course>
   <speed>14.574211</speed>
   <name>WP0222</name>
+  <sat>1</sat>
 </trkpt>
 <trkpt lat="45.491079984" lon="-75.690218307">
   <ele>97.400000</ele>
@@ -1722,6 +2082,7 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>111.029999</course>
   <speed>13.776822</speed>
   <name>WP0224</name>
+  <sat>2</sat>
 </trkpt>
 <trkpt lat="45.491183318" lon="-75.688611640">
   <ele>97.300000</ele>
@@ -1729,6 +2090,7 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>126.019997</course>
   <speed>15.505356</speed>
   <name>WP0225</name>
+  <sat>2</sat>
 </trkpt>
 <trkpt lat="45.490993318" lon="-75.688663307">
   <ele>99.000000</ele>
@@ -1736,6 +2098,8 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>171.699997</course>
   <speed>10.607844</speed>
   <name>WP0226</name>
+  <fix>2d</fix>
+  <sat>3</sat>
   <pdop>2.000000</pdop>
 </trkpt>
 <trkpt lat="45.489688318" lon="-75.688748307">
@@ -1744,6 +2108,7 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>154.520004</course>
   <speed>6.543733</speed>
   <name>WP0227</name>
+  <sat>2</sat>
 </trkpt>
 <trkpt lat="45.489516651" lon="-75.688719974">
   <ele>99.200000</ele>
@@ -1751,6 +2116,8 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>159.869995</course>
   <speed>0.133756</speed>
   <name>WP0228</name>
+  <fix>2d</fix>
+  <sat>3</sat>
   <pdop>2.000000</pdop>
 </trkpt>
 <trkpt lat="45.489606651" lon="-75.688778307">
@@ -1759,6 +2126,8 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>169.960007</course>
   <speed>0.154333</speed>
   <name>WP0229</name>
+  <fix>2d</fix>
+  <sat>3</sat>
   <pdop>2.000000</pdop>
 </trkpt>
 <trkpt lat="45.489716651" lon="-75.688851640">
@@ -1767,6 +2136,8 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>167.100006</course>
   <speed>1.152356</speed>
   <name>WP0230</name>
+  <fix>2d</fix>
+  <sat>3</sat>
   <pdop>2.000000</pdop>
 </trkpt>
 <trkpt lat="45.489636651" lon="-75.688773307">
@@ -1775,6 +2146,7 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>318.260010</course>
   <speed>0.864267</speed>
   <name>WP0231</name>
+  <sat>1</sat>
 </trkpt>
 <trkpt lat="45.489688318" lon="-75.688884974">
   <ele>98.000000</ele>
@@ -1782,6 +2154,7 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>76.680000</course>
   <speed>1.646222</speed>
   <name>WP0232</name>
+  <sat>1</sat>
 </trkpt>
 <trkpt lat="45.489699984" lon="-75.688648307">
   <ele>98.200000</ele>
@@ -1789,6 +2162,7 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>47.889999</course>
   <speed>3.251289</speed>
   <name>WP0233</name>
+  <sat>1</sat>
 </trkpt>
 <trkpt lat="45.489858318" lon="-75.688149974">
   <ele>98.400000</ele>
@@ -1796,6 +2170,7 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>47.889999</course>
   <speed>3.251289</speed>
   <name>WP0234</name>
+  <sat>1</sat>
 </trkpt>
 <trkpt lat="45.489979984" lon="-75.687781640">
   <ele>98.400000</ele>
@@ -1803,6 +2178,8 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>240.000000</course>
   <speed>0.123467</speed>
   <name>WP0235</name>
+  <fix>2d</fix>
+  <sat>3</sat>
   <pdop>2.000000</pdop>
 </trkpt>
 <trkpt lat="45.489979984" lon="-75.687646640">
@@ -1811,6 +2188,7 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>159.000000</course>
   <speed>0.128611</speed>
   <name>WP0236</name>
+  <sat>2</sat>
 </trkpt>
 <trkpt lat="45.490004984" lon="-75.684934974">
   <ele>97.400000</ele>
@@ -1818,6 +2196,7 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <course>247.240005</course>
   <speed>0.334389</speed>
   <name>WP0237</name>
+  <sat>2</sat>
 </trkpt>
 </trkseg>
 </trk>
diff --git a/gpsbabel/reference/vitosmt.gpx b/gpsbabel/reference/vitosmt.gpx
index 0ddde76a5..543661ff6 100644
--- a/gpsbabel/reference/vitosmt.gpx
+++ b/gpsbabel/reference/vitosmt.gpx
@@ -13,294 +13,366 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <name>WP0001</name>
   <cmt>WP0001</cmt>
   <desc>WP0001</desc>
+  <fix>2d</fix>
+  <sat>3</sat>
   <pdop>30.600000</pdop>
-<fix>2d</fix><sat>3</sat></wpt>
+</wpt>
 <wpt lat="45.460339984" lon="-75.767591640">
   <ele>33.700000</ele>
 <time>2005-05-09T19:02:03Z</time>
   <name>WP0002</name>
   <cmt>WP0002</cmt>
   <desc>WP0002</desc>
+  <fix>2d</fix>
+  <sat>3</sat>
   <pdop>30.600000</pdop>
-<fix>2d</fix><sat>3</sat></wpt>
+</wpt>
 <wpt lat="45.458376651" lon="-75.768483307">
   <ele>105.400000</ele>
 <time>2005-05-09T20:09:13Z</time>
   <name>WP0003</name>
   <cmt>WP0003</cmt>
   <desc>WP0003</desc>
+  <fix>dgps</fix>
+  <sat>7</sat>
   <pdop>1.400000</pdop>
-<fix>dgps</fix><sat>7</sat></wpt>
+</wpt>
 <wpt lat="45.458293318" lon="-75.768566640">
   <ele>104.600000</ele>
 <time>2005-05-09T20:09:23Z</time>
   <name>WP0004</name>
   <cmt>WP0004</cmt>
   <desc>WP0004</desc>
+  <fix>dgps</fix>
+  <sat>5</sat>
   <pdop>2.400000</pdop>
-<fix>dgps</fix><sat>5</sat></wpt>
+</wpt>
 <wpt lat="45.458298318" lon="-75.768701640">
   <ele>102.500000</ele>
 <time>2005-05-09T20:09:44Z</time>
   <name>WP0005</name>
   <cmt>WP0005</cmt>
   <desc>WP0005</desc>
+  <fix>dgps</fix>
+  <sat>5</sat>
   <pdop>2.400000</pdop>
-<fix>dgps</fix><sat>5</sat></wpt>
+</wpt>
 <wpt lat="45.458266651" lon="-75.769021640">
   <ele>108.900000</ele>
 <time>2005-05-09T20:10:04Z</time>
   <name>WP0006</name>
   <cmt>WP0006</cmt>
   <desc>WP0006</desc>
+  <fix>dgps</fix>
+  <sat>6</sat>
   <pdop>2.200000</pdop>
-<fix>dgps</fix><sat>6</sat></wpt>
+</wpt>
 <wpt lat="45.458204984" lon="-75.770038307">
   <ele>108.400000</ele>
 <time>2005-05-09T20:11:22Z</time>
   <name>WP0007</name>
   <cmt>WP0007</cmt>
   <desc>WP0007</desc>
+  <fix>dgps</fix>
+  <sat>9</sat>
   <pdop>1.000000</pdop>
-<fix>dgps</fix><sat>9</sat></wpt>
+</wpt>
 <wpt lat="45.458274984" lon="-75.770526640">
   <ele>110.600000</ele>
 <time>2005-05-09T20:11:50Z</time>
   <name>WP0008</name>
   <cmt>WP0008</cmt>
   <desc>WP0008</desc>
+  <fix>dgps</fix>
+  <sat>8</sat>
   <pdop>1.400000</pdop>
-<fix>dgps</fix><sat>8</sat></wpt>
+</wpt>
 <wpt lat="45.458353318" lon="-75.770481640">
   <ele>106.200000</ele>
 <time>2005-05-09T20:14:00Z</time>
   <name>WP0009</name>
   <cmt>WP0009</cmt>
   <desc>WP0009</desc>
+  <fix>dgps</fix>
+  <sat>10</sat>
   <pdop>1.000000</pdop>
-<fix>dgps</fix><sat>10</sat></wpt>
+</wpt>
 <wpt lat="45.492471651" lon="-75.717699974">
   <ele>34.100000</ele>
 <time>2005-05-09T21:36:00Z</time>
   <name>WP0010</name>
   <cmt>WP0010</cmt>
   <desc>WP0010</desc>
+  <fix>2d</fix>
+  <sat>3</sat>
   <pdop>7.000000</pdop>
-<fix>2d</fix><sat>3</sat></wpt>
+</wpt>
 <wpt lat="45.492506651" lon="-75.717636640">
   <ele>-22.300000</ele>
 <time>2005-06-03T21:36:06Z</time>
   <name>WP0011</name>
   <cmt>WP0011</cmt>
   <desc>WP0011</desc>
+  <fix>dgps</fix>
+  <sat>5</sat>
   <pdop>2.600000</pdop>
-<fix>dgps</fix><sat>5</sat></wpt>
+</wpt>
 <wpt lat="45.492283318" lon="-75.717694974">
   <ele>-34.800000</ele>
 <time>2005-06-03T21:36:08Z</time>
   <name>WP0012</name>
   <cmt>WP0012</cmt>
   <desc>WP0012</desc>
+  <fix>3d</fix>
+  <sat>4</sat>
   <pdop>3.400000</pdop>
-<fix>3d</fix><sat>4</sat></wpt>
+</wpt>
 <wpt lat="45.492396651" lon="-75.717684974">
   <ele>-28.700000</ele>
 <time>2005-06-03T21:36:09Z</time>
   <name>WP0013</name>
   <cmt>WP0013</cmt>
   <desc>WP0013</desc>
+  <fix>dgps</fix>
+  <sat>5</sat>
   <pdop>2.600000</pdop>
-<fix>dgps</fix><sat>5</sat></wpt>
+</wpt>
 <wpt lat="45.492381651" lon="-75.717586640">
   <ele>-21.000000</ele>
 <time>2005-06-03T21:36:17Z</time>
   <name>WP0014</name>
   <cmt>WP0014</cmt>
   <desc>WP0014</desc>
+  <fix>3d</fix>
+  <sat>4</sat>
   <pdop>3.800000</pdop>
-<fix>3d</fix><sat>4</sat></wpt>
+</wpt>
 <wpt lat="45.492294984" lon="-75.717593307">
   <ele>-25.300000</ele>
 <time>2005-06-03T21:36:31Z</time>
   <name>WP0015</name>
   <cmt>WP0015</cmt>
   <desc>WP0015</desc>
-<fix>none</fix><sat>2</sat></wpt>
+  <sat>2</sat>
+</wpt>
 <wpt lat="45.491944984" lon="-75.717474974">
   <ele>43.400000</ele>
 <time>2005-06-03T21:36:45Z</time>
   <name>WP0016</name>
   <cmt>WP0016</cmt>
   <desc>WP0016</desc>
+  <fix>3d</fix>
+  <sat>4</sat>
   <pdop>3.800000</pdop>
-<fix>3d</fix><sat>4</sat></wpt>
+</wpt>
 <wpt lat="45.491938318" lon="-75.717353307">
   <ele>39.300000</ele>
 <time>2005-06-03T21:36:51Z</time>
   <name>WP0017</name>
   <cmt>WP0017</cmt>
   <desc>WP0017</desc>
+  <fix>dgps</fix>
+  <sat>6</sat>
   <pdop>1.600000</pdop>
-<fix>dgps</fix><sat>6</sat></wpt>
+</wpt>
 <wpt lat="45.491969984" lon="-75.717238307">
   <ele>48.300000</ele>
 <time>2005-06-03T21:36:58Z</time>
   <name>WP0018</name>
   <cmt>WP0018</cmt>
   <desc>WP0018</desc>
+  <fix>dgps</fix>
+  <sat>5</sat>
   <pdop>1.600000</pdop>
-<fix>dgps</fix><sat>5</sat></wpt>
+</wpt>
 <wpt lat="45.491994984" lon="-75.717094974">
   <ele>44.500000</ele>
 <time>2005-06-03T21:37:07Z</time>
   <name>WP0019</name>
   <cmt>WP0019</cmt>
   <desc>WP0019</desc>
+  <fix>dgps</fix>
+  <sat>5</sat>
   <pdop>1.600000</pdop>
-<fix>dgps</fix><sat>5</sat></wpt>
+</wpt>
 <wpt lat="45.491996651" lon="-75.716914974">
   <ele>39.900000</ele>
 <time>2005-06-03T21:37:18Z</time>
   <name>WP0020</name>
   <cmt>WP0020</cmt>
   <desc>WP0020</desc>
+  <fix>dgps</fix>
+  <sat>5</sat>
   <pdop>2.600000</pdop>
-<fix>dgps</fix><sat>5</sat></wpt>
+</wpt>
 <wpt lat="45.492019984" lon="-75.716781640">
   <ele>23.600000</ele>
 <time>2005-06-03T21:37:26Z</time>
   <name>WP0021</name>
   <cmt>WP0021</cmt>
   <desc>WP0021</desc>
+  <fix>dgps</fix>
+  <sat>5</sat>
   <pdop>2.600000</pdop>
-<fix>dgps</fix><sat>5</sat></wpt>
+</wpt>
 <wpt lat="45.492071651" lon="-75.716738307">
   <ele>46.700000</ele>
 <time>2005-06-03T21:37:46Z</time>
   <name>WP0022</name>
   <cmt>WP0022</cmt>
   <desc>WP0022</desc>
+  <fix>3d</fix>
+  <sat>4</sat>
   <pdop>4.000000</pdop>
-<fix>3d</fix><sat>4</sat></wpt>
+</wpt>
 <wpt lat="45.492071651" lon="-75.716736640">
   <ele>61.300000</ele>
 <time>2005-06-03T21:37:52Z</time>
   <name>WP0023</name>
   <cmt>WP0023</cmt>
   <desc>WP0023</desc>
+  <fix>dgps</fix>
+  <sat>5</sat>
   <pdop>1.600000</pdop>
-<fix>dgps</fix><sat>5</sat></wpt>
+</wpt>
 <wpt lat="45.492096651" lon="-75.716736640">
   <ele>74.600000</ele>
 <time>2005-06-03T21:38:16Z</time>
   <name>WP0024</name>
   <cmt>WP0024</cmt>
   <desc>WP0024</desc>
+  <fix>3d</fix>
+  <sat>4</sat>
   <pdop>4.000000</pdop>
-<fix>3d</fix><sat>4</sat></wpt>
+</wpt>
 <wpt lat="45.492099984" lon="-75.716729974">
   <ele>63.600000</ele>
 <time>2005-06-03T21:38:50Z</time>
   <name>WP0025</name>
   <cmt>WP0025</cmt>
   <desc>WP0025</desc>
+  <fix>3d</fix>
+  <sat>4</sat>
   <pdop>2.200000</pdop>
-<fix>3d</fix><sat>4</sat></wpt>
+</wpt>
 <wpt lat="45.492721651" lon="-75.718441640">
   <ele>83.600000</ele>
 <time>2005-06-03T21:55:06Z</time>
   <name>WP0026</name>
   <cmt>WP0026</cmt>
   <desc>WP0026</desc>
+  <fix>3d</fix>
+  <sat>4</sat>
   <pdop>5.200000</pdop>
-<fix>3d</fix><sat>4</sat></wpt>
+</wpt>
 <wpt lat="45.492656651" lon="-75.718409974">
   <ele>76.200000</ele>
 <time>2005-06-03T21:55:14Z</time>
   <name>WP0027</name>
   <cmt>WP0027</cmt>
   <desc>WP0027</desc>
+  <fix>3d</fix>
+  <sat>4</sat>
   <pdop>5.200000</pdop>
-<fix>3d</fix><sat>4</sat></wpt>
+</wpt>
 <wpt lat="45.492591651" lon="-75.718313307">
   <ele>76.300000</ele>
 <time>2005-06-03T21:57:31Z</time>
   <name>WP0028</name>
   <cmt>WP0028</cmt>
   <desc>WP0028</desc>
+  <fix>2d</fix>
+  <sat>3</sat>
   <pdop>10.600000</pdop>
-<fix>2d</fix><sat>3</sat></wpt>
+</wpt>
 <wpt lat="45.492568318" lon="-75.718309974">
   <ele>59.800000</ele>
 <time>2005-06-03T21:57:54Z</time>
   <name>WP0029</name>
   <cmt>WP0029</cmt>
   <desc>WP0029</desc>
+  <fix>3d</fix>
+  <sat>4</sat>
   <pdop>5.200000</pdop>
-<fix>3d</fix><sat>4</sat></wpt>
+</wpt>
 <wpt lat="45.492314984" lon="-75.718339974">
   <ele>34.300000</ele>
 <time>2005-06-04T23:06:26Z</time>
   <name>WP0030</name>
   <cmt>WP0030</cmt>
   <desc>WP0030</desc>
+  <fix>2d</fix>
+  <sat>3</sat>
   <pdop>25.400000</pdop>
-<fix>2d</fix><sat>3</sat></wpt>
+</wpt>
 <wpt lat="45.491909984" lon="-75.718324974">
   <ele>34.300000</ele>
 <time>2005-06-04T23:14:32Z</time>
   <name>WP0031</name>
   <cmt>WP0031</cmt>
   <desc>WP0031</desc>
+  <fix>2d</fix>
+  <sat>3</sat>
   <pdop>28.200001</pdop>
-<fix>2d</fix><sat>3</sat></wpt>
+</wpt>
 <wpt lat="45.492206651" lon="-75.718414974">
   <ele>34.300000</ele>
 <time>2005-06-04T23:14:43Z</time>
   <name>WP0032</name>
   <cmt>WP0032</cmt>
   <desc>WP0032</desc>
+  <fix>2d</fix>
+  <sat>3</sat>
   <pdop>28.200001</pdop>
-<fix>2d</fix><sat>3</sat></wpt>
+</wpt>
 <wpt lat="45.492689984" lon="-75.718359974">
   <ele>70.800000</ele>
 <time>2005-06-04T23:15:39Z</time>
   <name>WP0033</name>
   <cmt>WP0033</cmt>
   <desc>WP0033</desc>
+  <fix>dgps</fix>
+  <sat>5</sat>
   <pdop>1.800000</pdop>
-<fix>dgps</fix><sat>5</sat></wpt>
+</wpt>
 <wpt lat="45.492691651" lon="-75.718408307">
   <ele>61.200000</ele>
 <time>2005-06-04T23:16:38Z</time>
   <name>WP0034</name>
   <cmt>WP0034</cmt>
   <desc>WP0034</desc>
+  <fix>3d</fix>
+  <sat>4</sat>
   <pdop>2.000000</pdop>
-<fix>3d</fix><sat>4</sat></wpt>
+</wpt>
 <wpt lat="45.492601651" lon="-75.718438307">
   <ele>62.400000</ele>
 <time>2005-06-04T23:17:21Z</time>
   <name>WP0035</name>
   <cmt>WP0035</cmt>
   <desc>WP0035</desc>
-<fix>none</fix><sat>1</sat></wpt>
+  <sat>1</sat>
+</wpt>
 <wpt lat="45.492479984" lon="-75.718403307">
   <ele>54.200000</ele>
 <time>2005-06-04T23:22:58Z</time>
   <name>WP0036</name>
   <cmt>WP0036</cmt>
   <desc>WP0036</desc>
+  <fix>3d</fix>
+  <sat>4</sat>
   <pdop>6.800000</pdop>
-<fix>3d</fix><sat>4</sat></wpt>
+</wpt>
 <wpt lat="45.492566651" lon="-75.718339974">
   <ele>57.000000</ele>
 <time>2005-06-04T23:25:52Z</time>
   <name>WP0037</name>
   <cmt>WP0037</cmt>
   <desc>WP0037</desc>
+  <fix>3d</fix>
+  <sat>4</sat>
   <pdop>19.400000</pdop>
-<fix>3d</fix><sat>4</sat></wpt>
+</wpt>
 <wpt lat="45.492343318" lon="-75.722331640">
   <ele>0.000000</ele>
 <time>2005-06-04T23:39:14Z</time>
@@ -315,1507 +387,1814 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <name>WP0039</name>
   <cmt>WP0039</cmt>
   <desc>WP0039</desc>
+  <fix>3d</fix>
+  <sat>4</sat>
   <pdop>17.799999</pdop>
-<fix>3d</fix><sat>4</sat></wpt>
+</wpt>
 <wpt lat="45.492369984" lon="-75.722586640">
   <ele>74.800000</ele>
 <time>2005-06-04T23:39:19Z</time>
   <name>WP0040</name>
   <cmt>WP0040</cmt>
   <desc>WP0040</desc>
+  <fix>dgps</fix>
+  <sat>7</sat>
   <pdop>1.000000</pdop>
-<fix>dgps</fix><sat>7</sat></wpt>
+</wpt>
 <wpt lat="45.493596651" lon="-75.728018307">
   <ele>95.100000</ele>
 <time>2005-06-04T23:44:29Z</time>
   <name>WP0041</name>
   <cmt>WP0041</cmt>
   <desc>WP0041</desc>
+  <fix>dgps</fix>
+  <sat>5</sat>
   <pdop>1.600000</pdop>
-<fix>dgps</fix><sat>5</sat></wpt>
+</wpt>
 <wpt lat="45.492388318" lon="-75.731491640">
   <ele>69.100000</ele>
 <time>2005-06-04T23:50:38Z</time>
   <name>WP0042</name>
   <cmt>WP0042</cmt>
   <desc>WP0042</desc>
+  <fix>dgps</fix>
+  <sat>7</sat>
   <pdop>1.000000</pdop>
-<fix>dgps</fix><sat>7</sat></wpt>
+</wpt>
 <wpt lat="45.492379984" lon="-75.731639974">
   <ele>71.300000</ele>
 <time>2005-06-04T23:52:35Z</time>
   <name>WP0043</name>
   <cmt>WP0043</cmt>
   <desc>WP0043</desc>
+  <fix>dgps</fix>
+  <sat>7</sat>
   <pdop>1.000000</pdop>
-<fix>dgps</fix><sat>7</sat></wpt>
+</wpt>
 <wpt lat="45.492419984" lon="-75.731754974">
   <ele>71.300000</ele>
 <time>2005-06-04T23:52:43Z</time>
   <name>WP0044</name>
   <cmt>WP0044</cmt>
   <desc>WP0044</desc>
+  <fix>dgps</fix>
+  <sat>6</sat>
   <pdop>1.400000</pdop>
-<fix>dgps</fix><sat>6</sat></wpt>
+</wpt>
 <wpt lat="45.492678318" lon="-75.732136640">
   <ele>71.300000</ele>
 <time>2005-06-04T23:53:15Z</time>
   <name>WP0045</name>
   <cmt>WP0045</cmt>
   <desc>WP0045</desc>
+  <fix>dgps</fix>
+  <sat>6</sat>
   <pdop>1.400000</pdop>
-<fix>dgps</fix><sat>6</sat></wpt>
+</wpt>
 <wpt lat="45.492764984" lon="-75.732181640">
   <ele>70.700000</ele>
 <time>2005-06-04T23:53:25Z</time>
   <name>WP0046</name>
   <cmt>WP0046</cmt>
   <desc>WP0046</desc>
+  <fix>dgps</fix>
+  <sat>6</sat>
   <pdop>1.400000</pdop>
-<fix>dgps</fix><sat>6</sat></wpt>
+</wpt>
 <wpt lat="45.493056651" lon="-75.734448307">
   <ele>68.400000</ele>
 <time>2005-06-04T23:56:24Z</time>
   <name>WP0047</name>
   <cmt>WP0047</cmt>
   <desc>WP0047</desc>
+  <fix>dgps</fix>
+  <sat>6</sat>
   <pdop>1.200000</pdop>
-<fix>dgps</fix><sat>6</sat></wpt>
+</wpt>
 <wpt lat="45.492984984" lon="-75.734376640">
   <ele>72.900000</ele>
 <time>2005-06-04T23:56:54Z</time>
   <name>WP0048</name>
   <cmt>WP0048</cmt>
   <desc>WP0048</desc>
+  <fix>dgps</fix>
+  <sat>6</sat>
   <pdop>1.200000</pdop>
-<fix>dgps</fix><sat>6</sat></wpt>
+</wpt>
 <wpt lat="45.493048318" lon="-75.734484974">
   <ele>71.400000</ele>
 <time>2005-06-04T23:57:12Z</time>
   <name>WP0049</name>
   <cmt>WP0049</cmt>
   <desc>WP0049</desc>
+  <fix>dgps</fix>
+  <sat>7</sat>
   <pdop>1.000000</pdop>
-<fix>dgps</fix><sat>7</sat></wpt>
+</wpt>
 <wpt lat="45.493248318" lon="-75.734873307">
   <ele>71.200000</ele>
 <time>2005-06-04T23:57:43Z</time>
   <name>WP0050</name>
   <cmt>WP0050</cmt>
   <desc>WP0050</desc>
+  <fix>dgps</fix>
+  <sat>8</sat>
   <pdop>1.000000</pdop>
-<fix>dgps</fix><sat>8</sat></wpt>
+</wpt>
 <wpt lat="45.493511651" lon="-75.735343307">
   <ele>71.600000</ele>
 <time>2005-06-04T23:58:26Z</time>
   <name>WP0051</name>
   <cmt>WP0051</cmt>
   <desc>WP0051</desc>
+  <fix>dgps</fix>
+  <sat>7</sat>
   <pdop>1.400000</pdop>
-<fix>dgps</fix><sat>7</sat></wpt>
+</wpt>
 <wpt lat="45.494089984" lon="-75.736121640">
   <ele>71.000000</ele>
 <time>2005-06-04T00:00:00Z</time>
   <name>WP0052</name>
   <cmt>WP0052</cmt>
   <desc>WP0052</desc>
-<fix>none</fix><sat>2</sat></wpt>
+  <sat>2</sat>
+</wpt>
 <wpt lat="45.494091651" lon="-75.736254974">
   <ele>72.100000</ele>
 <time>2005-06-05T00:00:11Z</time>
   <name>WP0053</name>
   <cmt>WP0053</cmt>
   <desc>WP0053</desc>
-<fix>none</fix><sat>2</sat></wpt>
+  <sat>2</sat>
+</wpt>
 <wpt lat="45.494156651" lon="-75.736351640">
   <ele>72.700000</ele>
 <time>2005-06-05T00:00:20Z</time>
   <name>WP0054</name>
   <cmt>WP0054</cmt>
   <desc>WP0054</desc>
+  <fix>2d</fix>
+  <sat>3</sat>
   <pdop>6.200000</pdop>
-<fix>2d</fix><sat>3</sat></wpt>
+</wpt>
 <wpt lat="45.494316651" lon="-75.736706640">
   <ele>72.200000</ele>
 <time>2005-06-05T00:00:48Z</time>
   <name>WP0055</name>
   <cmt>WP0055</cmt>
   <desc>WP0055</desc>
-<fix>none</fix><sat>2</sat></wpt>
+  <sat>2</sat>
+</wpt>
 <wpt lat="45.494326651" lon="-75.736839974">
   <ele>72.500000</ele>
 <time>2005-06-05T00:00:59Z</time>
   <name>WP0056</name>
   <cmt>WP0056</cmt>
   <desc>WP0056</desc>
-<fix>none</fix><sat>2</sat></wpt>
+  <sat>2</sat>
+</wpt>
 <wpt lat="45.494348318" lon="-75.737104974">
   <ele>73.000000</ele>
 <time>2005-06-05T00:01:09Z</time>
   <name>WP0057</name>
   <cmt>WP0057</cmt>
   <desc>WP0057</desc>
-<fix>none</fix><sat>2</sat></wpt>
+  <sat>2</sat>
+</wpt>
 <wpt lat="45.494411651" lon="-75.737268307">
   <ele>73.300000</ele>
 <time>2005-06-05T00:01:44Z</time>
   <name>WP0058</name>
   <cmt>WP0058</cmt>
   <desc>WP0058</desc>
+  <fix>2d</fix>
+  <sat>3</sat>
   <pdop>19.400000</pdop>
-<fix>2d</fix><sat>3</sat></wpt>
+</wpt>
 <wpt lat="45.494488318" lon="-75.737228307">
   <ele>78.100000</ele>
 <time>2005-06-05T00:01:58Z</time>
   <name>WP0059</name>
   <cmt>WP0059</cmt>
   <desc>WP0059</desc>
+  <fix>2d</fix>
+  <sat>3</sat>
   <pdop>6.000000</pdop>
-<fix>2d</fix><sat>3</sat></wpt>
+</wpt>
 <wpt lat="45.494713318" lon="-75.737163307">
   <ele>77.000000</ele>
 <time>2005-06-05T00:02:16Z</time>
   <name>WP0060</name>
   <cmt>WP0060</cmt>
   <desc>WP0060</desc>
+  <fix>3d</fix>
+  <sat>4</sat>
   <pdop>4.200000</pdop>
-<fix>3d</fix><sat>4</sat></wpt>
+</wpt>
 <wpt lat="45.494818318" lon="-75.737188307">
   <ele>75.500000</ele>
 <time>2005-06-05T00:02:25Z</time>
   <name>WP0061</name>
   <cmt>WP0061</cmt>
   <desc>WP0061</desc>
+  <fix>3d</fix>
+  <sat>4</sat>
   <pdop>4.200000</pdop>
-<fix>3d</fix><sat>4</sat></wpt>
+</wpt>
 <wpt lat="45.495011651" lon="-75.737183307">
   <ele>71.000000</ele>
 <time>2005-06-05T00:02:42Z</time>
   <name>WP0062</name>
   <cmt>WP0062</cmt>
   <desc>WP0062</desc>
+  <fix>3d</fix>
+  <sat>4</sat>
   <pdop>12.400000</pdop>
-<fix>3d</fix><sat>4</sat></wpt>
+</wpt>
 <wpt lat="45.495254984" lon="-75.737171640">
   <ele>75.800000</ele>
 <time>2005-06-05T00:03:21Z</time>
   <name>WP0063</name>
   <cmt>WP0063</cmt>
   <desc>WP0063</desc>
+  <fix>3d</fix>
+  <sat>4</sat>
   <pdop>4.200000</pdop>
-<fix>3d</fix><sat>4</sat></wpt>
+</wpt>
 <wpt lat="45.495354984" lon="-75.737114974">
   <ele>72.600000</ele>
 <time>2005-06-05T00:03:31Z</time>
   <name>WP0064</name>
   <cmt>WP0064</cmt>
   <desc>WP0064</desc>
+  <fix>dgps</fix>
+  <sat>6</sat>
   <pdop>1.600000</pdop>
-<fix>dgps</fix><sat>6</sat></wpt>
+</wpt>
 <wpt lat="45.495581651" lon="-75.736874974">
   <ele>70.300000</ele>
 <time>2005-06-05T00:03:53Z</time>
   <name>WP0065</name>
   <cmt>WP0065</cmt>
   <desc>WP0065</desc>
+  <fix>dgps</fix>
+  <sat>5</sat>
   <pdop>2.800000</pdop>
-<fix>dgps</fix><sat>5</sat></wpt>
+</wpt>
 <wpt lat="45.495921651" lon="-75.736509974">
   <ele>74.600000</ele>
 <time>2005-06-05T00:04:31Z</time>
   <name>WP0066</name>
   <cmt>WP0066</cmt>
   <desc>WP0066</desc>
+  <fix>dgps</fix>
+  <sat>5</sat>
   <pdop>1.800000</pdop>
-<fix>dgps</fix><sat>5</sat></wpt>
+</wpt>
 <wpt lat="45.495844984" lon="-75.736588307">
   <ele>76.300000</ele>
 <time>2005-06-05T00:05:05Z</time>
   <name>WP0067</name>
   <cmt>WP0067</cmt>
   <desc>WP0067</desc>
+  <fix>dgps</fix>
+  <sat>5</sat>
   <pdop>1.600000</pdop>
-<fix>dgps</fix><sat>5</sat></wpt>
+</wpt>
 <wpt lat="45.495876651" lon="-75.736471640">
   <ele>72.100000</ele>
 <time>2005-06-05T00:05:45Z</time>
   <name>WP0068</name>
   <cmt>WP0068</cmt>
   <desc>WP0068</desc>
+  <fix>2d</fix>
+  <sat>3</sat>
   <pdop>5.200000</pdop>
-<fix>2d</fix><sat>3</sat></wpt>
+</wpt>
 <wpt lat="45.495916651" lon="-75.736536640">
   <ele>80.900000</ele>
 <time>2005-06-05T00:06:19Z</time>
   <name>WP0069</name>
   <cmt>WP0069</cmt>
   <desc>WP0069</desc>
+  <fix>3d</fix>
+  <sat>4</sat>
   <pdop>4.000000</pdop>
-<fix>3d</fix><sat>4</sat></wpt>
+</wpt>
 <wpt lat="45.495866651" lon="-75.736521640">
   <ele>89.500000</ele>
 <time>2005-06-05T00:06:25Z</time>
   <name>WP0070</name>
   <cmt>WP0070</cmt>
   <desc>WP0070</desc>
+  <fix>3d</fix>
+  <sat>4</sat>
   <pdop>4.000000</pdop>
-<fix>3d</fix><sat>4</sat></wpt>
+</wpt>
 <wpt lat="45.496203318" lon="-75.734848307">
   <ele>102.100000</ele>
 <time>2005-06-05T00:37:53Z</time>
   <name>WP0071</name>
   <cmt>WP0071</cmt>
   <desc>WP0071</desc>
+  <fix>3d</fix>
+  <sat>4</sat>
   <pdop>2.200000</pdop>
-<fix>3d</fix><sat>4</sat></wpt>
+</wpt>
 <wpt lat="45.496083318" lon="-75.734841640">
   <ele>102.800000</ele>
 <time>2005-06-11T00:38:21Z</time>
   <name>WP0072</name>
   <cmt>WP0072</cmt>
   <desc>WP0072</desc>
+  <fix>2d</fix>
+  <sat>3</sat>
   <pdop>13.400000</pdop>
-<fix>2d</fix><sat>3</sat></wpt>
+</wpt>
 <wpt lat="45.496109984" lon="-75.734754974">
   <ele>94.100000</ele>
 <time>2005-06-11T00:38:55Z</time>
   <name>WP0073</name>
   <cmt>WP0073</cmt>
   <desc>WP0073</desc>
+  <fix>dgps</fix>
+  <sat>5</sat>
   <pdop>1.600000</pdop>
-<fix>dgps</fix><sat>5</sat></wpt>
+</wpt>
 <wpt lat="45.496299984" lon="-75.734379974">
   <ele>93.300000</ele>
 <time>2005-06-11T00:39:44Z</time>
   <name>WP0074</name>
   <cmt>WP0074</cmt>
   <desc>WP0074</desc>
+  <fix>dgps</fix>
+  <sat>5</sat>
   <pdop>1.600000</pdop>
-<fix>dgps</fix><sat>5</sat></wpt>
+</wpt>
 <wpt lat="45.496259984" lon="-75.734368307">
   <ele>83.800000</ele>
 <time>2005-06-11T00:40:44Z</time>
   <name>WP0075</name>
   <cmt>WP0075</cmt>
   <desc>WP0075</desc>
-<fix>none</fix><sat>2</sat></wpt>
+  <sat>2</sat>
+</wpt>
 <wpt lat="45.496204984" lon="-75.734474974">
   <ele>85.100000</ele>
 <time>2005-06-11T00:41:04Z</time>
   <name>WP0076</name>
   <cmt>WP0076</cmt>
   <desc>WP0076</desc>
-<fix>none</fix><sat>2</sat></wpt>
+  <sat>2</sat>
+</wpt>
 <wpt lat="45.496191651" lon="-75.734614974">
   <ele>85.600000</ele>
 <time>2005-06-11T00:41:11Z</time>
   <name>WP0077</name>
   <cmt>WP0077</cmt>
   <desc>WP0077</desc>
+  <fix>2d</fix>
+  <sat>3</sat>
   <pdop>16.000000</pdop>
-<fix>2d</fix><sat>3</sat></wpt>
+</wpt>
 <wpt lat="45.496134984" lon="-75.734768307">
   <ele>85.900000</ele>
 <time>2005-06-11T00:41:19Z</time>
   <name>WP0078</name>
   <cmt>WP0078</cmt>
   <desc>WP0078</desc>
-<fix>none</fix><sat>2</sat></wpt>
+  <sat>2</sat>
+</wpt>
 <wpt lat="45.496108318" lon="-75.734911640">
   <ele>85.200000</ele>
 <time>2005-06-11T00:41:27Z</time>
   <name>WP0079</name>
   <cmt>WP0079</cmt>
   <desc>WP0079</desc>
+  <fix>3d</fix>
+  <sat>4</sat>
   <pdop>2.400000</pdop>
-<fix>3d</fix><sat>4</sat></wpt>
+</wpt>
 <wpt lat="45.496044984" lon="-75.735079974">
   <ele>87.100000</ele>
 <time>2005-06-11T00:41:43Z</time>
   <name>WP0080</name>
   <cmt>WP0080</cmt>
   <desc>WP0080</desc>
+  <fix>3d</fix>
+  <sat>4</sat>
   <pdop>3.200000</pdop>
-<fix>3d</fix><sat>4</sat></wpt>
+</wpt>
 <wpt lat="45.495993318" lon="-75.735166640">
   <ele>82.300000</ele>
 <time>2005-06-11T00:41:51Z</time>
   <name>WP0081</name>
   <cmt>WP0081</cmt>
   <desc>WP0081</desc>
+  <fix>dgps</fix>
+  <sat>6</sat>
   <pdop>1.200000</pdop>
-<fix>dgps</fix><sat>6</sat></wpt>
+</wpt>
 <wpt lat="45.495931651" lon="-75.735276640">
   <ele>78.800000</ele>
 <time>2005-06-11T00:42:00Z</time>
   <name>WP0082</name>
   <cmt>WP0082</cmt>
   <desc>WP0082</desc>
+  <fix>3d</fix>
+  <sat>4</sat>
   <pdop>2.400000</pdop>
-<fix>3d</fix><sat>4</sat></wpt>
+</wpt>
 <wpt lat="45.495874984" lon="-75.735439974">
   <ele>75.500000</ele>
 <time>2005-06-11T00:42:14Z</time>
   <name>WP0083</name>
   <cmt>WP0083</cmt>
   <desc>WP0083</desc>
+  <fix>dgps</fix>
+  <sat>5</sat>
   <pdop>1.400000</pdop>
-<fix>dgps</fix><sat>5</sat></wpt>
+</wpt>
 <wpt lat="45.495826651" lon="-75.735561640">
   <ele>74.100000</ele>
 <time>2005-06-11T00:42:25Z</time>
   <name>WP0084</name>
   <cmt>WP0084</cmt>
   <desc>WP0084</desc>
+  <fix>3d</fix>
+  <sat>4</sat>
   <pdop>2.000000</pdop>
-<fix>3d</fix><sat>4</sat></wpt>
+</wpt>
 <wpt lat="45.495858318" lon="-75.735689974">
   <ele>72.500000</ele>
 <time>2005-06-11T00:42:50Z</time>
   <name>WP0085</name>
   <cmt>WP0085</cmt>
   <desc>WP0085</desc>
-<fix>none</fix><sat>2</sat></wpt>
+  <sat>2</sat>
+</wpt>
 <wpt lat="45.495931651" lon="-75.735779974">
   <ele>74.000000</ele>
 <time>2005-06-11T00:43:01Z</time>
   <name>WP0086</name>
   <cmt>WP0086</cmt>
   <desc>WP0086</desc>
+  <fix>2d</fix>
+  <sat>3</sat>
   <pdop>40.599998</pdop>
-<fix>2d</fix><sat>3</sat></wpt>
+</wpt>
 <wpt lat="45.495899984" lon="-75.735658307">
   <ele>74.700000</ele>
 <time>2005-06-11T00:43:09Z</time>
   <name>WP0087</name>
   <cmt>WP0087</cmt>
   <desc>WP0087</desc>
+  <fix>3d</fix>
+  <sat>4</sat>
   <pdop>2.000000</pdop>
-<fix>3d</fix><sat>4</sat></wpt>
+</wpt>
 <wpt lat="45.495808318" lon="-75.735613307">
   <ele>72.300000</ele>
 <time>2005-06-11T00:43:38Z</time>
   <name>WP0088</name>
   <cmt>WP0088</cmt>
   <desc>WP0088</desc>
-<fix>none</fix><sat>0</sat></wpt>
+</wpt>
 <wpt lat="45.495711651" lon="-75.735599974">
   <ele>72.200000</ele>
 <time>2005-06-11T00:44:05Z</time>
   <name>WP0089</name>
   <cmt>WP0089</cmt>
   <desc>WP0089</desc>
-<fix>none</fix><sat>0</sat></wpt>
+</wpt>
 <wpt lat="45.495679984" lon="-75.735724974">
   <ele>73.000000</ele>
 <time>2005-06-11T00:44:11Z</time>
   <name>WP0090</name>
   <cmt>WP0090</cmt>
   <desc>WP0090</desc>
+  <fix>2d</fix>
+  <sat>3</sat>
   <pdop>38.200001</pdop>
-<fix>2d</fix><sat>3</sat></wpt>
+</wpt>
 <wpt lat="45.495651651" lon="-75.735859974">
   <ele>74.400000</ele>
 <time>2005-06-11T00:44:23Z</time>
   <name>WP0091</name>
   <cmt>WP0091</cmt>
   <desc>WP0091</desc>
-<fix>none</fix><sat>2</sat></wpt>
+  <sat>2</sat>
+</wpt>
 <wpt lat="45.495756651" lon="-75.735824974">
   <ele>81.200000</ele>
 <time>2005-06-11T00:44:43Z</time>
   <name>WP0092</name>
   <cmt>WP0092</cmt>
   <desc>WP0092</desc>
+  <fix>2d</fix>
+  <sat>3</sat>
   <pdop>37.200001</pdop>
-<fix>2d</fix><sat>3</sat></wpt>
+</wpt>
 <wpt lat="45.495728318" lon="-75.735801640">
   <ele>70.100000</ele>
 <time>2005-06-11T00:44:47Z</time>
   <name>WP0093</name>
   <cmt>WP0093</cmt>
   <desc>WP0093</desc>
+  <fix>3d</fix>
+  <sat>4</sat>
   <pdop>9.400000</pdop>
-<fix>3d</fix><sat>4</sat></wpt>
+</wpt>
 <wpt lat="45.495708318" lon="-75.735911640">
   <ele>64.400000</ele>
 <time>2005-06-11T00:45:02Z</time>
   <name>WP0094</name>
   <cmt>WP0094</cmt>
   <desc>WP0094</desc>
-<fix>none</fix><sat>2</sat></wpt>
+  <sat>2</sat>
+</wpt>
 <wpt lat="45.495683318" lon="-75.736064974">
   <ele>64.000000</ele>
 <time>2005-06-11T00:45:35Z</time>
   <name>WP0095</name>
   <cmt>WP0095</cmt>
   <desc>WP0095</desc>
-<fix>none</fix><sat>1</sat></wpt>
+  <sat>1</sat>
+</wpt>
 <wpt lat="45.495584984" lon="-75.736138307">
   <ele>64.600000</ele>
 <time>2005-06-11T00:46:07Z</time>
   <name>WP0096</name>
   <cmt>WP0096</cmt>
   <desc>WP0096</desc>
+  <fix>2d</fix>
+  <sat>3</sat>
   <pdop>23.000000</pdop>
-<fix>2d</fix><sat>3</sat></wpt>
+</wpt>
 <wpt lat="45.495651651" lon="-75.736043307">
   <ele>67.300000</ele>
 <time>2005-06-11T00:46:36Z</time>
   <name>WP0097</name>
   <cmt>WP0097</cmt>
   <desc>WP0097</desc>
+  <fix>2d</fix>
+  <sat>3</sat>
   <pdop>5.200000</pdop>
-<fix>2d</fix><sat>3</sat></wpt>
+</wpt>
 <wpt lat="45.495691651" lon="-75.735939974">
   <ele>71.400000</ele>
 <time>2005-06-11T00:48:44Z</time>
   <name>WP0098</name>
   <cmt>WP0098</cmt>
   <desc>WP0098</desc>
+  <fix>3d</fix>
+  <sat>4</sat>
   <pdop>43.599998</pdop>
-<fix>3d</fix><sat>4</sat></wpt>
+</wpt>
 <wpt lat="45.495706651" lon="-75.736066640">
   <ele>71.700000</ele>
 <time>2005-06-11T00:49:14Z</time>
   <name>WP0099</name>
   <cmt>WP0099</cmt>
   <desc>WP0099</desc>
+  <fix>2d</fix>
+  <sat>3</sat>
   <pdop>24.200001</pdop>
-<fix>2d</fix><sat>3</sat></wpt>
+</wpt>
 <wpt lat="45.495733318" lon="-75.735924974">
   <ele>72.300000</ele>
 <time>2005-06-11T00:51:19Z</time>
   <name>WP0100</name>
   <cmt>WP0100</cmt>
   <desc>WP0100</desc>
+  <fix>3d</fix>
+  <sat>4</sat>
   <pdop>2.200000</pdop>
-<fix>3d</fix><sat>4</sat></wpt>
+</wpt>
 <wpt lat="45.495666651" lon="-75.735996640">
   <ele>81.200000</ele>
 <time>2005-06-11T00:51:31Z</time>
   <name>WP0101</name>
   <cmt>WP0101</cmt>
   <desc>WP0101</desc>
+  <fix>2d</fix>
+  <sat>3</sat>
   <pdop>36.400002</pdop>
-<fix>2d</fix><sat>3</sat></wpt>
+</wpt>
 <wpt lat="45.495646651" lon="-75.735903307">
   <ele>74.500000</ele>
 <time>2005-06-11T00:51:43Z</time>
   <name>WP0102</name>
   <cmt>WP0102</cmt>
   <desc>WP0102</desc>
-<fix>none</fix><sat>2</sat></wpt>
+  <sat>2</sat>
+</wpt>
 <wpt lat="45.495689984" lon="-75.735704974">
   <ele>74.700000</ele>
 <time>2005-06-11T00:51:53Z</time>
   <name>WP0103</name>
   <cmt>WP0103</cmt>
   <desc>WP0103</desc>
+  <fix>2d</fix>
+  <sat>3</sat>
   <pdop>13.600000</pdop>
-<fix>2d</fix><sat>3</sat></wpt>
+</wpt>
 <wpt lat="45.495769984" lon="-75.735519974">
   <ele>76.200000</ele>
 <time>2005-06-11T00:52:08Z</time>
   <name>WP0104</name>
   <cmt>WP0104</cmt>
   <desc>WP0104</desc>
+  <fix>2d</fix>
+  <sat>3</sat>
   <pdop>50.000000</pdop>
-<fix>2d</fix><sat>3</sat></wpt>
+</wpt>
 <wpt lat="45.495858318" lon="-75.735479974">
   <ele>77.900000</ele>
 <time>2005-06-11T00:52:19Z</time>
   <name>WP0105</name>
   <cmt>WP0105</cmt>
   <desc>WP0105</desc>
+  <fix>2d</fix>
+  <sat>3</sat>
   <pdop>26.400000</pdop>
-<fix>2d</fix><sat>3</sat></wpt>
+</wpt>
 <wpt lat="45.495914984" lon="-75.735378307">
   <ele>78.600000</ele>
 <time>2005-06-11T00:52:27Z</time>
   <name>WP0106</name>
   <cmt>WP0106</cmt>
   <desc>WP0106</desc>
+  <fix>3d</fix>
+  <sat>4</sat>
   <pdop>50.000000</pdop>
-<fix>3d</fix><sat>4</sat></wpt>
+</wpt>
 <wpt lat="45.495991651" lon="-75.735234974">
   <ele>80.700000</ele>
 <time>2005-06-11T00:52:37Z</time>
   <name>WP0107</name>
   <cmt>WP0107</cmt>
   <desc>WP0107</desc>
+  <fix>dgps</fix>
+  <sat>5</sat>
   <pdop>1.600000</pdop>
-<fix>dgps</fix><sat>5</sat></wpt>
+</wpt>
 <wpt lat="45.496076651" lon="-75.735043307">
   <ele>84.400000</ele>
 <time>2005-06-11T00:52:54Z</time>
   <name>WP0108</name>
   <cmt>WP0108</cmt>
   <desc>WP0108</desc>
-<fix>none</fix><sat>2</sat></wpt>
+  <sat>2</sat>
+</wpt>
 <wpt lat="45.496214984" lon="-75.734634974">
   <ele>92.600000</ele>
 <time>2005-06-11T00:53:33Z</time>
   <name>WP0109</name>
   <cmt>WP0109</cmt>
   <desc>WP0109</desc>
+  <fix>dgps</fix>
+  <sat>5</sat>
   <pdop>2.000000</pdop>
-<fix>dgps</fix><sat>5</sat></wpt>
+</wpt>
 <wpt lat="45.496243318" lon="-75.734476640">
   <ele>95.800000</ele>
 <time>2005-06-11T00:53:43Z</time>
   <name>WP0110</name>
   <cmt>WP0110</cmt>
   <desc>WP0110</desc>
+  <fix>3d</fix>
+  <sat>4</sat>
   <pdop>5.000000</pdop>
-<fix>3d</fix><sat>4</sat></wpt>
+</wpt>
 <wpt lat="45.496326651" lon="-75.734336640">
   <ele>94.700000</ele>
 <time>2005-06-11T00:53:53Z</time>
   <name>WP0111</name>
   <cmt>WP0111</cmt>
   <desc>WP0111</desc>
+  <fix>dgps</fix>
+  <sat>7</sat>
   <pdop>0.800000</pdop>
-<fix>dgps</fix><sat>7</sat></wpt>
+</wpt>
 <wpt lat="45.496198318" lon="-75.734216640">
   <ele>59.200000</ele>
 <time>2005-06-11T14:39:26Z</time>
   <name>WP0112</name>
   <cmt>WP0112</cmt>
   <desc>WP0112</desc>
+  <fix>3d</fix>
+  <sat>4</sat>
   <pdop>9.400000</pdop>
-<fix>3d</fix><sat>4</sat></wpt>
+</wpt>
 <wpt lat="45.496179984" lon="-75.734338307">
   <ele>55.200000</ele>
 <time>2005-06-12T14:39:42Z</time>
   <name>WP0113</name>
   <cmt>WP0113</cmt>
   <desc>WP0113</desc>
+  <fix>2d</fix>
+  <sat>3</sat>
   <pdop>6.000000</pdop>
-<fix>2d</fix><sat>3</sat></wpt>
+</wpt>
 <wpt lat="45.496081651" lon="-75.734656640">
   <ele>56.100000</ele>
 <time>2005-06-12T14:40:08Z</time>
   <name>WP0114</name>
   <cmt>WP0114</cmt>
   <desc>WP0114</desc>
+  <fix>2d</fix>
+  <sat>3</sat>
   <pdop>7.600000</pdop>
-<fix>2d</fix><sat>3</sat></wpt>
+</wpt>
 <wpt lat="45.495996651" lon="-75.734781640">
   <ele>54.500000</ele>
 <time>2005-06-12T14:40:16Z</time>
   <name>WP0115</name>
   <cmt>WP0115</cmt>
   <desc>WP0115</desc>
+  <fix>3d</fix>
+  <sat>4</sat>
   <pdop>11.800000</pdop>
-<fix>3d</fix><sat>4</sat></wpt>
+</wpt>
 <wpt lat="45.495906651" lon="-75.734983307">
   <ele>48.700000</ele>
 <time>2005-06-12T14:40:33Z</time>
   <name>WP0116</name>
   <cmt>WP0116</cmt>
   <desc>WP0116</desc>
-<fix>none</fix><sat>2</sat></wpt>
+  <sat>2</sat>
+</wpt>
 <wpt lat="45.495801651" lon="-75.735363307">
   <ele>43.700000</ele>
 <time>2005-06-12T14:41:02Z</time>
   <name>WP0117</name>
   <cmt>WP0117</cmt>
   <desc>WP0117</desc>
+  <fix>2d</fix>
+  <sat>3</sat>
   <pdop>7.200000</pdop>
-<fix>2d</fix><sat>3</sat></wpt>
+</wpt>
 <wpt lat="45.495801651" lon="-75.735514974">
   <ele>45.100000</ele>
 <time>2005-06-12T14:41:16Z</time>
   <name>WP0118</name>
   <cmt>WP0118</cmt>
   <desc>WP0118</desc>
-<fix>none</fix><sat>2</sat></wpt>
+  <sat>2</sat>
+</wpt>
 <wpt lat="45.495833318" lon="-75.735654974">
   <ele>44.600000</ele>
 <time>2005-06-12T14:41:24Z</time>
   <name>WP0119</name>
   <cmt>WP0119</cmt>
   <desc>WP0119</desc>
+  <fix>3d</fix>
+  <sat>4</sat>
   <pdop>16.600000</pdop>
-<fix>3d</fix><sat>4</sat></wpt>
+</wpt>
 <wpt lat="45.495914984" lon="-75.735726640">
   <ele>44.100000</ele>
 <time>2005-06-12T14:41:31Z</time>
   <name>WP0120</name>
   <cmt>WP0120</cmt>
   <desc>WP0120</desc>
-<fix>none</fix><sat>2</sat></wpt>
+  <sat>2</sat>
+</wpt>
 <wpt lat="45.495956651" lon="-75.735839974">
   <ele>43.000000</ele>
 <time>2005-06-12T14:41:40Z</time>
   <name>WP0121</name>
   <cmt>WP0121</cmt>
   <desc>WP0121</desc>
-<fix>none</fix><sat>2</sat></wpt>
+  <sat>2</sat>
+</wpt>
 <wpt lat="45.496036651" lon="-75.735908307">
   <ele>42.000000</ele>
 <time>2005-06-12T14:41:48Z</time>
   <name>WP0122</name>
   <cmt>WP0122</cmt>
   <desc>WP0122</desc>
+  <fix>2d</fix>
+  <sat>3</sat>
   <pdop>7.200000</pdop>
-<fix>2d</fix><sat>3</sat></wpt>
+</wpt>
 <wpt lat="45.496151651" lon="-75.735971640">
   <ele>41.400000</ele>
 <time>2005-06-12T14:41:55Z</time>
   <name>WP0123</name>
   <cmt>WP0123</cmt>
   <desc>WP0123</desc>
+  <fix>2d</fix>
+  <sat>3</sat>
   <pdop>6.800000</pdop>
-<fix>2d</fix><sat>3</sat></wpt>
+</wpt>
 <wpt lat="45.496328318" lon="-75.735998307">
   <ele>41.600000</ele>
 <time>2005-06-12T14:42:05Z</time>
   <name>WP0124</name>
   <cmt>WP0124</cmt>
   <desc>WP0124</desc>
+  <fix>2d</fix>
+  <sat>3</sat>
   <pdop>6.800000</pdop>
-<fix>2d</fix><sat>3</sat></wpt>
+</wpt>
 <wpt lat="45.496431651" lon="-75.735963307">
   <ele>41.600000</ele>
 <time>2005-06-12T14:42:14Z</time>
   <name>WP0125</name>
   <cmt>WP0125</cmt>
   <desc>WP0125</desc>
-<fix>none</fix><sat>1</sat></wpt>
+  <sat>1</sat>
+</wpt>
 <wpt lat="45.496608318" lon="-75.735874974">
   <ele>41.600000</ele>
 <time>2005-06-12T14:42:31Z</time>
   <name>WP0126</name>
   <cmt>WP0126</cmt>
   <desc>WP0126</desc>
+  <fix>2d</fix>
+  <sat>3</sat>
   <pdop>7.000000</pdop>
-<fix>2d</fix><sat>3</sat></wpt>
+</wpt>
 <wpt lat="45.496763318" lon="-75.735828307">
   <ele>41.600000</ele>
 <time>2005-06-12T14:42:44Z</time>
   <name>WP0127</name>
   <cmt>WP0127</cmt>
   <desc>WP0127</desc>
-<fix>none</fix><sat>2</sat></wpt>
+  <sat>2</sat>
+</wpt>
 <wpt lat="45.496854984" lon="-75.735886640">
   <ele>41.600000</ele>
 <time>2005-06-12T14:42:50Z</time>
   <name>WP0128</name>
   <cmt>WP0128</cmt>
   <desc>WP0128</desc>
-<fix>none</fix><sat>2</sat></wpt>
+  <sat>2</sat>
+</wpt>
 <wpt lat="45.496996651" lon="-75.735931640">
   <ele>41.600000</ele>
 <time>2005-06-12T14:43:03Z</time>
   <name>WP0129</name>
   <cmt>WP0129</cmt>
   <desc>WP0129</desc>
-<fix>none</fix><sat>2</sat></wpt>
+  <sat>2</sat>
+</wpt>
 <wpt lat="45.497081651" lon="-75.735889974">
   <ele>41.600000</ele>
 <time>2005-06-12T14:43:06Z</time>
   <name>WP0130</name>
   <cmt>WP0130</cmt>
   <desc>WP0130</desc>
-<fix>none</fix><sat>2</sat></wpt>
+  <sat>2</sat>
+</wpt>
 <wpt lat="45.497164984" lon="-75.735838307">
   <ele>41.600000</ele>
 <time>2005-06-12T14:43:15Z</time>
   <name>WP0131</name>
   <cmt>WP0131</cmt>
   <desc>WP0131</desc>
-<fix>none</fix><sat>1</sat></wpt>
+  <sat>1</sat>
+</wpt>
 <wpt lat="45.497229984" lon="-75.735719974">
   <ele>41.600000</ele>
 <time>2005-06-12T14:43:24Z</time>
   <name>WP0132</name>
   <cmt>WP0132</cmt>
   <desc>WP0132</desc>
+  <fix>2d</fix>
+  <sat>3</sat>
   <pdop>7.400000</pdop>
-<fix>2d</fix><sat>3</sat></wpt>
+</wpt>
 <wpt lat="45.497303318" lon="-75.735568307">
   <ele>41.700000</ele>
 <time>2005-06-12T14:43:34Z</time>
   <name>WP0133</name>
   <cmt>WP0133</cmt>
   <desc>WP0133</desc>
+  <fix>3d</fix>
+  <sat>4</sat>
   <pdop>33.799999</pdop>
-<fix>3d</fix><sat>4</sat></wpt>
+</wpt>
 <wpt lat="45.497301651" lon="-75.735439974">
   <ele>41.700000</ele>
 <time>2005-06-12T14:43:41Z</time>
   <name>WP0134</name>
   <cmt>WP0134</cmt>
   <desc>WP0134</desc>
+  <fix>2d</fix>
+  <sat>3</sat>
   <pdop>6.800000</pdop>
-<fix>2d</fix><sat>3</sat></wpt>
+</wpt>
 <wpt lat="45.497318318" lon="-75.735193307">
   <ele>41.800000</ele>
 <time>2005-06-12T14:43:54Z</time>
   <name>WP0135</name>
   <cmt>WP0135</cmt>
   <desc>WP0135</desc>
-<fix>none</fix><sat>2</sat></wpt>
+  <sat>2</sat>
+</wpt>
 <wpt lat="45.497329984" lon="-75.734973307">
   <ele>42.300000</ele>
 <time>2005-06-12T14:44:06Z</time>
   <name>WP0136</name>
   <cmt>WP0136</cmt>
   <desc>WP0136</desc>
+  <fix>3d</fix>
+  <sat>4</sat>
   <pdop>21.799999</pdop>
-<fix>3d</fix><sat>4</sat></wpt>
+</wpt>
 <wpt lat="45.497464984" lon="-75.733798307">
   <ele>45.200000</ele>
 <time>2005-06-12T14:44:53Z</time>
   <name>WP0137</name>
   <cmt>WP0137</cmt>
   <desc>WP0137</desc>
+  <fix>2d</fix>
+  <sat>3</sat>
   <pdop>7.000000</pdop>
-<fix>2d</fix><sat>3</sat></wpt>
+</wpt>
 <wpt lat="45.497519984" lon="-75.733038307">
   <ele>46.700000</ele>
 <time>2005-06-12T14:45:30Z</time>
   <name>WP0138</name>
   <cmt>WP0138</cmt>
   <desc>WP0138</desc>
+  <fix>2d</fix>
+  <sat>3</sat>
   <pdop>8.400000</pdop>
-<fix>2d</fix><sat>3</sat></wpt>
+</wpt>
 <wpt lat="45.497474984" lon="-75.732808307">
   <ele>47.400000</ele>
 <time>2005-06-12T14:45:44Z</time>
   <name>WP0139</name>
   <cmt>WP0139</cmt>
   <desc>WP0139</desc>
+  <fix>2d</fix>
+  <sat>3</sat>
   <pdop>8.600000</pdop>
-<fix>2d</fix><sat>3</sat></wpt>
+</wpt>
 <wpt lat="45.497466651" lon="-75.732938307">
   <ele>48.300000</ele>
 <time>2005-06-12T14:45:55Z</time>
   <name>WP0140</name>
   <cmt>WP0140</cmt>
   <desc>WP0140</desc>
-<fix>none</fix><sat>2</sat></wpt>
+  <sat>2</sat>
+</wpt>
 <wpt lat="45.497506651" lon="-75.733146640">
   <ele>49.000000</ele>
 <time>2005-06-12T14:46:07Z</time>
   <name>WP0141</name>
   <cmt>WP0141</cmt>
   <desc>WP0141</desc>
-<fix>none</fix><sat>0</sat></wpt>
+</wpt>
 <wpt lat="45.497499984" lon="-75.733361640">
   <ele>49.400000</ele>
 <time>2005-06-12T14:46:22Z</time>
   <name>WP0142</name>
   <cmt>WP0142</cmt>
   <desc>WP0142</desc>
-<fix>none</fix><sat>2</sat></wpt>
+  <sat>2</sat>
+</wpt>
 <wpt lat="45.497463318" lon="-75.733511640">
   <ele>49.900000</ele>
 <time>2005-06-12T14:46:37Z</time>
   <name>WP0143</name>
   <cmt>WP0143</cmt>
   <desc>WP0143</desc>
+  <fix>3d</fix>
+  <sat>4</sat>
   <pdop>8.200000</pdop>
-<fix>3d</fix><sat>4</sat></wpt>
+</wpt>
 <wpt lat="45.497483318" lon="-75.733636640">
   <ele>49.500000</ele>
 <time>2005-06-12T14:47:06Z</time>
   <name>WP0144</name>
   <cmt>WP0144</cmt>
   <desc>WP0144</desc>
+  <fix>2d</fix>
+  <sat>3</sat>
   <pdop>6.400000</pdop>
-<fix>2d</fix><sat>3</sat></wpt>
+</wpt>
 <wpt lat="45.497466651" lon="-75.733898307">
   <ele>55.000000</ele>
 <time>2005-06-12T14:47:31Z</time>
   <name>WP0145</name>
   <cmt>WP0145</cmt>
   <desc>WP0145</desc>
+  <fix>2d</fix>
+  <sat>3</sat>
   <pdop>9.400000</pdop>
-<fix>2d</fix><sat>3</sat></wpt>
+</wpt>
 <wpt lat="45.497471651" lon="-75.734046640">
   <ele>56.600000</ele>
 <time>2005-06-12T14:47:40Z</time>
   <name>WP0146</name>
   <cmt>WP0146</cmt>
   <desc>WP0146</desc>
+  <fix>2d</fix>
+  <sat>3</sat>
   <pdop>5.400000</pdop>
-<fix>2d</fix><sat>3</sat></wpt>
+</wpt>
 <wpt lat="45.497383318" lon="-75.734076640">
   <ele>56.100000</ele>
 <time>2005-06-12T14:48:17Z</time>
   <name>WP0147</name>
   <cmt>WP0147</cmt>
   <desc>WP0147</desc>
+  <fix>2d</fix>
+  <sat>3</sat>
   <pdop>10.000000</pdop>
-<fix>2d</fix><sat>3</sat></wpt>
+</wpt>
 <wpt lat="45.497269984" lon="-75.734148307">
   <ele>56.700000</ele>
 <time>2005-06-12T14:48:37Z</time>
   <name>WP0148</name>
   <cmt>WP0148</cmt>
   <desc>WP0148</desc>
-<fix>none</fix><sat>2</sat></wpt>
+  <sat>2</sat>
+</wpt>
 <wpt lat="45.497241651" lon="-75.734263307">
   <ele>70.600000</ele>
 <time>2005-06-12T14:49:04Z</time>
   <name>WP0149</name>
   <cmt>WP0149</cmt>
   <desc>WP0149</desc>
+  <fix>3d</fix>
+  <sat>4</sat>
   <pdop>5.200000</pdop>
-<fix>3d</fix><sat>4</sat></wpt>
+</wpt>
 <wpt lat="45.497159984" lon="-75.734243307">
   <ele>75.600000</ele>
 <time>2005-06-12T14:49:14Z</time>
   <name>WP0150</name>
   <cmt>WP0150</cmt>
   <desc>WP0150</desc>
+  <fix>3d</fix>
+  <sat>4</sat>
   <pdop>5.000000</pdop>
-<fix>3d</fix><sat>4</sat></wpt>
+</wpt>
 <wpt lat="45.497066651" lon="-75.734216640">
   <ele>76.100000</ele>
 <time>2005-06-12T14:49:29Z</time>
   <name>WP0151</name>
   <cmt>WP0151</cmt>
   <desc>WP0151</desc>
+  <fix>2d</fix>
+  <sat>3</sat>
   <pdop>10.600000</pdop>
-<fix>2d</fix><sat>3</sat></wpt>
+</wpt>
 <wpt lat="45.496981651" lon="-75.734176640">
   <ele>77.400000</ele>
 <time>2005-06-12T14:49:49Z</time>
   <name>WP0152</name>
   <cmt>WP0152</cmt>
   <desc>WP0152</desc>
+  <fix>2d</fix>
+  <sat>3</sat>
   <pdop>6.400000</pdop>
-<fix>2d</fix><sat>3</sat></wpt>
+</wpt>
 <wpt lat="45.497001651" lon="-75.734269974">
   <ele>84.500000</ele>
 <time>2005-06-12T14:50:10Z</time>
   <name>WP0153</name>
   <cmt>WP0153</cmt>
   <desc>WP0153</desc>
-<fix>none</fix><sat>1</sat></wpt>
+  <sat>1</sat>
+</wpt>
 <wpt lat="45.497056651" lon="-75.734181640">
   <ele>90.200000</ele>
 <time>2005-06-12T14:50:25Z</time>
   <name>WP0154</name>
   <cmt>WP0154</cmt>
   <desc>WP0154</desc>
-<fix>none</fix><sat>2</sat></wpt>
+  <sat>2</sat>
+</wpt>
 <wpt lat="45.497098318" lon="-75.734301640">
   <ele>93.200000</ele>
 <time>2005-06-12T14:50:45Z</time>
   <name>WP0155</name>
   <cmt>WP0155</cmt>
   <desc>WP0155</desc>
-<fix>none</fix><sat>2</sat></wpt>
+  <sat>2</sat>
+</wpt>
 <wpt lat="45.497131651" lon="-75.734461640">
   <ele>94.400000</ele>
 <time>2005-06-12T14:50:55Z</time>
   <name>WP0156</name>
   <cmt>WP0156</cmt>
   <desc>WP0156</desc>
+  <fix>2d</fix>
+  <sat>3</sat>
   <pdop>6.400000</pdop>
-<fix>2d</fix><sat>3</sat></wpt>
+</wpt>
 <wpt lat="45.497083318" lon="-75.734576640">
   <ele>95.400000</ele>
 <time>2005-06-12T14:51:04Z</time>
   <name>WP0157</name>
   <cmt>WP0157</cmt>
   <desc>WP0157</desc>
-<fix>none</fix><sat>2</sat></wpt>
+  <sat>2</sat>
+</wpt>
 <wpt lat="45.497011651" lon="-75.734718307">
   <ele>96.500000</ele>
 <time>2005-06-12T14:51:16Z</time>
   <name>WP0158</name>
   <cmt>WP0158</cmt>
   <desc>WP0158</desc>
+  <fix>2d</fix>
+  <sat>3</sat>
   <pdop>6.200000</pdop>
-<fix>2d</fix><sat>3</sat></wpt>
+</wpt>
 <wpt lat="45.497041651" lon="-75.734841640">
   <ele>96.300000</ele>
 <time>2005-06-12T14:51:38Z</time>
   <name>WP0159</name>
   <cmt>WP0159</cmt>
   <desc>WP0159</desc>
-<fix>none</fix><sat>2</sat></wpt>
+  <sat>2</sat>
+</wpt>
 <wpt lat="45.496978318" lon="-75.734936640">
   <ele>97.000000</ele>
 <time>2005-06-12T14:51:47Z</time>
   <name>WP0160</name>
   <cmt>WP0160</cmt>
   <desc>WP0160</desc>
+  <fix>2d</fix>
+  <sat>3</sat>
   <pdop>6.200000</pdop>
-<fix>2d</fix><sat>3</sat></wpt>
+</wpt>
 <wpt lat="45.496954984" lon="-75.735069974">
   <ele>96.900000</ele>
 <time>2005-06-12T14:51:57Z</time>
   <name>WP0161</name>
   <cmt>WP0161</cmt>
   <desc>WP0161</desc>
-<fix>none</fix><sat>2</sat></wpt>
+  <sat>2</sat>
+</wpt>
 <wpt lat="45.496956651" lon="-75.735244974">
   <ele>98.200000</ele>
 <time>2005-06-12T14:52:10Z</time>
   <name>WP0162</name>
   <cmt>WP0162</cmt>
   <desc>WP0162</desc>
+  <fix>2d</fix>
+  <sat>3</sat>
   <pdop>6.200000</pdop>
-<fix>2d</fix><sat>3</sat></wpt>
+</wpt>
 <wpt lat="45.496894984" lon="-75.735343307">
   <ele>98.600000</ele>
 <time>2005-06-12T14:52:24Z</time>
   <name>WP0163</name>
   <cmt>WP0163</cmt>
   <desc>WP0163</desc>
+  <fix>2d</fix>
+  <sat>3</sat>
   <pdop>6.200000</pdop>
-<fix>2d</fix><sat>3</sat></wpt>
+</wpt>
 <wpt lat="45.496828318" lon="-75.735484974">
   <ele>98.400000</ele>
 <time>2005-06-12T14:52:38Z</time>
   <name>WP0164</name>
   <cmt>WP0164</cmt>
   <desc>WP0164</desc>
-<fix>none</fix><sat>2</sat></wpt>
+  <sat>2</sat>
+</wpt>
 <wpt lat="45.496764984" lon="-75.735634974">
   <ele>98.200000</ele>
 <time>2005-06-12T14:52:51Z</time>
   <name>WP0165</name>
   <cmt>WP0165</cmt>
   <desc>WP0165</desc>
+  <fix>2d</fix>
+  <sat>3</sat>
   <pdop>6.200000</pdop>
-<fix>2d</fix><sat>3</sat></wpt>
+</wpt>
 <wpt lat="45.496698318" lon="-75.735818307">
   <ele>97.000000</ele>
 <time>2005-06-12T14:53:04Z</time>
   <name>WP0166</name>
   <cmt>WP0166</cmt>
   <desc>WP0166</desc>
+  <fix>2d</fix>
+  <sat>3</sat>
   <pdop>6.200000</pdop>
-<fix>2d</fix><sat>3</sat></wpt>
+</wpt>
 <wpt lat="45.496658318" lon="-75.735986640">
   <ele>96.600000</ele>
 <time>2005-06-12T14:53:12Z</time>
   <name>WP0167</name>
   <cmt>WP0167</cmt>
   <desc>WP0167</desc>
+  <fix>2d</fix>
+  <sat>3</sat>
   <pdop>13.400000</pdop>
-<fix>2d</fix><sat>3</sat></wpt>
+</wpt>
 <wpt lat="45.496573318" lon="-75.736061640">
   <ele>96.100000</ele>
 <time>2005-06-12T14:53:17Z</time>
   <name>WP0168</name>
   <cmt>WP0168</cmt>
   <desc>WP0168</desc>
+  <fix>3d</fix>
+  <sat>4</sat>
   <pdop>3.200000</pdop>
-<fix>3d</fix><sat>4</sat></wpt>
+</wpt>
 <wpt lat="45.496441651" lon="-75.736114974">
   <ele>94.800000</ele>
 <time>2005-06-12T14:53:25Z</time>
   <name>WP0169</name>
   <cmt>WP0169</cmt>
   <desc>WP0169</desc>
+  <fix>2d</fix>
+  <sat>3</sat>
   <pdop>13.400000</pdop>
-<fix>2d</fix><sat>3</sat></wpt>
+</wpt>
 <wpt lat="45.496343318" lon="-75.736063307">
   <ele>95.200000</ele>
 <time>2005-06-12T14:53:30Z</time>
   <name>WP0170</name>
   <cmt>WP0170</cmt>
   <desc>WP0170</desc>
+  <fix>2d</fix>
+  <sat>3</sat>
   <pdop>13.600000</pdop>
-<fix>2d</fix><sat>3</sat></wpt>
+</wpt>
 <wpt lat="45.495934984" lon="-75.735669974">
   <ele>93.600000</ele>
 <time>2005-06-12T14:53:51Z</time>
   <name>WP0171</name>
   <cmt>WP0171</cmt>
   <desc>WP0171</desc>
+  <fix>2d</fix>
+  <sat>3</sat>
   <pdop>8.800000</pdop>
-<fix>2d</fix><sat>3</sat></wpt>
+</wpt>
 <wpt lat="45.495949984" lon="-75.735524974">
   <ele>92.400000</ele>
 <time>2005-06-12T14:53:56Z</time>
   <name>WP0172</name>
   <cmt>WP0172</cmt>
   <desc>WP0172</desc>
+  <fix>3d</fix>
+  <sat>4</sat>
   <pdop>3.000000</pdop>
-<fix>3d</fix><sat>4</sat></wpt>
+</wpt>
 <wpt lat="45.495986651" lon="-75.735344974">
   <ele>91.200000</ele>
 <time>2005-06-12T14:54:07Z</time>
   <name>WP0173</name>
   <cmt>WP0173</cmt>
   <desc>WP0173</desc>
+  <fix>3d</fix>
+  <sat>4</sat>
   <pdop>3.000000</pdop>
-<fix>3d</fix><sat>4</sat></wpt>
+</wpt>
 <wpt lat="45.496024984" lon="-75.735221640">
   <ele>92.400000</ele>
 <time>2005-06-12T14:54:19Z</time>
   <name>WP0174</name>
   <cmt>WP0174</cmt>
   <desc>WP0174</desc>
+  <fix>2d</fix>
+  <sat>3</sat>
   <pdop>6.200000</pdop>
-<fix>2d</fix><sat>3</sat></wpt>
+</wpt>
 <wpt lat="45.496096651" lon="-75.734986640">
   <ele>94.400000</ele>
 <time>2005-06-12T14:54:46Z</time>
   <name>WP0175</name>
   <cmt>WP0175</cmt>
   <desc>WP0175</desc>
+  <fix>3d</fix>
+  <sat>4</sat>
   <pdop>2.800000</pdop>
-<fix>3d</fix><sat>4</sat></wpt>
+</wpt>
 <wpt lat="45.496131651" lon="-75.734836640">
   <ele>92.800000</ele>
 <time>2005-06-12T14:55:02Z</time>
   <name>WP0176</name>
   <cmt>WP0176</cmt>
   <desc>WP0176</desc>
+  <fix>3d</fix>
+  <sat>4</sat>
   <pdop>2.800000</pdop>
-<fix>3d</fix><sat>4</sat></wpt>
+</wpt>
 <wpt lat="45.496186651" lon="-75.734716640">
   <ele>94.900000</ele>
 <time>2005-06-12T14:55:11Z</time>
   <name>WP0177</name>
   <cmt>WP0177</cmt>
   <desc>WP0177</desc>
+  <fix>2d</fix>
+  <sat>3</sat>
   <pdop>9.000000</pdop>
-<fix>2d</fix><sat>3</sat></wpt>
+</wpt>
 <wpt lat="45.496241651" lon="-75.734586640">
   <ele>95.600000</ele>
 <time>2005-06-12T14:55:21Z</time>
   <name>WP0178</name>
   <cmt>WP0178</cmt>
   <desc>WP0178</desc>
+  <fix>3d</fix>
+  <sat>4</sat>
   <pdop>2.800000</pdop>
-<fix>3d</fix><sat>4</sat></wpt>
+</wpt>
 <wpt lat="45.496301651" lon="-75.734363307">
   <ele>96.300000</ele>
 <time>2005-06-12T14:55:43Z</time>
   <name>WP0179</name>
   <cmt>WP0179</cmt>
   <desc>WP0179</desc>
+  <fix>2d</fix>
+  <sat>3</sat>
   <pdop>9.200000</pdop>
-<fix>2d</fix><sat>3</sat></wpt>
+</wpt>
 <wpt lat="45.496216651" lon="-75.734409974">
   <ele>96.300000</ele>
 <time>2005-06-12T14:56:17Z</time>
   <name>WP0180</name>
   <cmt>WP0180</cmt>
   <desc>WP0180</desc>
-<fix>none</fix><sat>1</sat></wpt>
+  <sat>1</sat>
+</wpt>
 <wpt lat="45.496306651" lon="-75.734371640">
   <ele>98.800000</ele>
 <time>2005-06-12T14:56:27Z</time>
   <name>WP0181</name>
   <cmt>WP0181</cmt>
   <desc>WP0181</desc>
+  <fix>3d</fix>
+  <sat>4</sat>
   <pdop>2.600000</pdop>
-<fix>3d</fix><sat>4</sat></wpt>
+</wpt>
 <wpt lat="45.496194984" lon="-75.734224974">
   <ele>97.900000</ele>
 <time>2005-06-12T14:57:10Z</time>
   <name>WP0182</name>
   <cmt>WP0182</cmt>
   <desc>WP0182</desc>
+  <fix>2d</fix>
+  <sat>3</sat>
   <pdop>9.600000</pdop>
-<fix>2d</fix><sat>3</sat></wpt>
+</wpt>
 <wpt lat="45.495998318" lon="-75.734101640">
   <ele>97.600000</ele>
 <time>2005-06-12T14:57:13Z</time>
   <name>WP0183</name>
   <cmt>WP0183</cmt>
   <desc>WP0183</desc>
-<fix>none</fix><sat>1</sat></wpt>
+  <sat>1</sat>
+</wpt>
 <wpt lat="45.494281651" lon="-75.733509974">
   <ele>97.300000</ele>
 <time>2005-06-12T14:57:44Z</time>
   <name>WP0184</name>
   <cmt>WP0184</cmt>
   <desc>WP0184</desc>
-<fix>none</fix><sat>0</sat></wpt>
+</wpt>
 <wpt lat="45.491526651" lon="-75.730496640">
   <ele>97.500000</ele>
 <time>2005-06-12T14:58:20Z</time>
   <name>WP0185</name>
   <cmt>WP0185</cmt>
   <desc>WP0185</desc>
-<fix>none</fix><sat>2</sat></wpt>
+  <sat>2</sat>
+</wpt>
 <wpt lat="45.490809984" lon="-75.728584974">
   <ele>97.700000</ele>
 <time>2005-06-12T14:58:21Z</time>
   <name>WP0186</name>
   <cmt>WP0186</cmt>
   <desc>WP0186</desc>
-<fix>none</fix><sat>2</sat></wpt>
+  <sat>2</sat>
+</wpt>
 <wpt lat="45.489388318" lon="-75.725018307">
   <ele>98.100000</ele>
 <time>2005-06-12T14:58:24Z</time>
   <name>WP0187</name>
   <cmt>WP0187</cmt>
   <desc>WP0187</desc>
-<fix>none</fix><sat>2</sat></wpt>
+  <sat>2</sat>
+</wpt>
 <wpt lat="45.488314984" lon="-75.722894974">
   <ele>98.200000</ele>
 <time>2005-06-12T14:58:28Z</time>
   <name>WP0188</name>
   <cmt>WP0188</cmt>
   <desc>WP0188</desc>
-<fix>none</fix><sat>2</sat></wpt>
+  <sat>2</sat>
+</wpt>
 <wpt lat="45.487204984" lon="-75.721489974">
   <ele>98.200000</ele>
 <time>2005-06-12T14:58:34Z</time>
   <name>WP0189</name>
   <cmt>WP0189</cmt>
   <desc>WP0189</desc>
-<fix>none</fix><sat>0</sat></wpt>
+</wpt>
 <wpt lat="45.487416651" lon="-75.720791640">
   <ele>97.900000</ele>
 <time>2005-06-12T14:58:42Z</time>
   <name>WP0190</name>
   <cmt>WP0190</cmt>
   <desc>WP0190</desc>
-<fix>none</fix><sat>2</sat></wpt>
+  <sat>2</sat>
+</wpt>
 <wpt lat="45.488398318" lon="-75.721109974">
   <ele>97.800000</ele>
 <time>2005-06-12T14:58:43Z</time>
   <name>WP0191</name>
   <cmt>WP0191</cmt>
   <desc>WP0191</desc>
-<fix>none</fix><sat>1</sat></wpt>
+  <sat>1</sat>
+</wpt>
 <wpt lat="45.490408318" lon="-75.722254974">
   <ele>101.300000</ele>
 <time>2005-06-12T14:58:46Z</time>
   <name>WP0192</name>
   <cmt>WP0192</cmt>
   <desc>WP0192</desc>
-<fix>none</fix><sat>2</sat></wpt>
+  <sat>2</sat>
+</wpt>
 <wpt lat="45.491743318" lon="-75.723359974">
   <ele>105.300000</ele>
 <time>2005-06-12T14:58:52Z</time>
   <name>WP0193</name>
   <cmt>WP0193</cmt>
   <desc>WP0193</desc>
+  <fix>2d</fix>
+  <sat>3</sat>
   <pdop>10.000000</pdop>
-<fix>2d</fix><sat>3</sat></wpt>
+</wpt>
 <wpt lat="45.491659984" lon="-75.723431640">
   <ele>105.600000</ele>
 <time>2005-06-12T14:58:54Z</time>
   <name>WP0194</name>
   <cmt>WP0194</cmt>
   <desc>WP0194</desc>
-<fix>none</fix><sat>2</sat></wpt>
+  <sat>2</sat>
+</wpt>
 <wpt lat="45.491213318" lon="-75.723554974">
   <ele>105.700000</ele>
 <time>2005-06-12T14:59:01Z</time>
   <name>WP0195</name>
   <cmt>WP0195</cmt>
   <desc>WP0195</desc>
-<fix>none</fix><sat>1</sat></wpt>
+  <sat>1</sat>
+</wpt>
 <wpt lat="45.490278318" lon="-75.723608307">
   <ele>104.700000</ele>
 <time>2005-06-12T14:59:15Z</time>
   <name>WP0196</name>
   <cmt>WP0196</cmt>
   <desc>WP0196</desc>
-<fix>none</fix><sat>2</sat></wpt>
+  <sat>2</sat>
+</wpt>
 <wpt lat="45.490369984" lon="-75.723388307">
   <ele>103.600000</ele>
 <time>2005-06-12T14:59:17Z</time>
   <name>WP0197</name>
   <cmt>WP0197</cmt>
   <desc>WP0197</desc>
-<fix>none</fix><sat>2</sat></wpt>
+  <sat>2</sat>
+</wpt>
 <wpt lat="45.490526651" lon="-75.721809974">
   <ele>101.300000</ele>
 <time>2005-06-12T14:59:24Z</time>
   <name>WP0198</name>
   <cmt>WP0198</cmt>
   <desc>WP0198</desc>
-<fix>none</fix><sat>2</sat></wpt>
+  <sat>2</sat>
+</wpt>
 <wpt lat="45.490071651" lon="-75.720394974">
   <ele>99.900000</ele>
 <time>2005-06-12T14:59:29Z</time>
   <name>WP0199</name>
   <cmt>WP0199</cmt>
   <desc>WP0199</desc>
+  <fix>2d</fix>
+  <sat>3</sat>
   <pdop>2.600000</pdop>
-<fix>2d</fix><sat>3</sat></wpt>
+</wpt>
 <wpt lat="45.488781651" lon="-75.717853307">
   <ele>98.100000</ele>
 <time>2005-06-12T14:59:40Z</time>
   <name>WP0200</name>
   <cmt>WP0200</cmt>
   <desc>WP0200</desc>
-<fix>none</fix><sat>1</sat></wpt>
+  <sat>1</sat>
+</wpt>
 <wpt lat="45.488024984" lon="-75.715301640">
   <ele>97.900000</ele>
 <time>2005-06-12T14:59:54Z</time>
   <name>WP0201</name>
   <cmt>WP0201</cmt>
   <desc>WP0201</desc>
-<fix>none</fix><sat>2</sat></wpt>
+  <sat>2</sat>
+</wpt>
 <wpt lat="45.487381651" lon="-75.712531640">
   <ele>97.700000</ele>
 <time>2005-06-12T15:00:08Z</time>
   <name>WP0202</name>
   <cmt>WP0202</cmt>
   <desc>WP0202</desc>
-<fix>none</fix><sat>1</sat></wpt>
+  <sat>1</sat>
+</wpt>
 <wpt lat="45.487396651" lon="-75.711828307">
   <ele>97.700000</ele>
 <time>2005-06-12T15:00:12Z</time>
   <name>WP0203</name>
   <cmt>WP0203</cmt>
   <desc>WP0203</desc>
-<fix>none</fix><sat>2</sat></wpt>
+  <sat>2</sat>
+</wpt>
 <wpt lat="45.487534984" lon="-75.711744974">
   <ele>97.700000</ele>
 <time>2005-06-12T15:00:13Z</time>
   <name>WP0204</name>
   <cmt>WP0204</cmt>
   <desc>WP0204</desc>
-<fix>none</fix><sat>2</sat></wpt>
+  <sat>2</sat>
+</wpt>
 <wpt lat="45.487728318" lon="-75.711471640">
   <ele>97.500000</ele>
 <time>2005-06-12T15:00:15Z</time>
   <name>WP0205</name>
   <cmt>WP0205</cmt>
   <desc>WP0205</desc>
-<fix>none</fix><sat>2</sat></wpt>
+  <sat>2</sat>
+</wpt>
 <wpt lat="45.487859984" lon="-75.710994974">
   <ele>97.300000</ele>
 <time>2005-06-12T15:00:17Z</time>
   <name>WP0206</name>
   <cmt>WP0206</cmt>
   <desc>WP0206</desc>
-<fix>none</fix><sat>2</sat></wpt>
+  <sat>2</sat>
+</wpt>
 <wpt lat="45.488128318" lon="-75.708784974">
   <ele>97.100000</ele>
 <time>2005-06-12T15:00:26Z</time>
   <name>WP0207</name>
   <cmt>WP0207</cmt>
   <desc>WP0207</desc>
-<fix>none</fix><sat>1</sat></wpt>
+  <sat>1</sat>
+</wpt>
 <wpt lat="45.488351651" lon="-75.705628307">
   <ele>97.000000</ele>
 <time>2005-06-12T15:00:39Z</time>
   <name>WP0208</name>
   <cmt>WP0208</cmt>
   <desc>WP0208</desc>
-<fix>none</fix><sat>1</sat></wpt>
+  <sat>1</sat>
+</wpt>
 <wpt lat="45.488748318" lon="-75.704488307">
   <ele>97.100000</ele>
 <time>2005-06-12T15:00:43Z</time>
   <name>WP0209</name>
   <cmt>WP0209</cmt>
   <desc>WP0209</desc>
+  <fix>2d</fix>
+  <sat>3</sat>
   <pdop>6.400000</pdop>
-<fix>2d</fix><sat>3</sat></wpt>
+</wpt>
 <wpt lat="45.489294984" lon="-75.703023307">
   <ele>97.200000</ele>
 <time>2005-06-12T15:00:52Z</time>
   <name>WP0210</name>
   <cmt>WP0210</cmt>
   <desc>WP0210</desc>
+  <fix>2d</fix>
+  <sat>3</sat>
   <pdop>6.400000</pdop>
-<fix>2d</fix><sat>3</sat></wpt>
+</wpt>
 <wpt lat="45.489278318" lon="-75.703171640">
   <ele>97.100000</ele>
 <time>2005-06-12T15:00:56Z</time>
   <name>WP0211</name>
   <cmt>WP0211</cmt>
   <desc>WP0211</desc>
+  <fix>2d</fix>
+  <sat>3</sat>
   <pdop>6.400000</pdop>
-<fix>2d</fix><sat>3</sat></wpt>
+</wpt>
 <wpt lat="45.489263318" lon="-75.703306640">
   <ele>96.900000</ele>
 <time>2005-06-12T15:01:14Z</time>
   <name>WP0212</name>
   <cmt>WP0212</cmt>
   <desc>WP0212</desc>
-<fix>none</fix><sat>1</sat></wpt>
+  <sat>1</sat>
+</wpt>
 <wpt lat="45.489364984" lon="-75.702803307">
   <ele>96.900000</ele>
 <time>2005-06-12T15:01:37Z</time>
   <name>WP0213</name>
   <cmt>WP0213</cmt>
   <desc>WP0213</desc>
-<fix>none</fix><sat>2</sat></wpt>
+  <sat>2</sat>
+</wpt>
 <wpt lat="45.489553318" lon="-75.700098307">
   <ele>97.300000</ele>
 <time>2005-06-12T15:01:45Z</time>
   <name>WP0214</name>
   <cmt>WP0214</cmt>
   <desc>WP0214</desc>
-<fix>none</fix><sat>0</sat></wpt>
+</wpt>
 <wpt lat="45.489698318" lon="-75.698621640">
   <ele>97.200000</ele>
 <time>2005-06-12T15:01:59Z</time>
   <name>WP0215</name>
   <cmt>WP0215</cmt>
   <desc>WP0215</desc>
+  <fix>2d</fix>
+  <sat>3</sat>
   <pdop>6.400000</pdop>
-<fix>2d</fix><sat>3</sat></wpt>
+</wpt>
 <wpt lat="45.489766651" lon="-75.698538307">
   <ele>97.200000</ele>
 <time>2005-06-12T15:02:04Z</time>
   <name>WP0216</name>
   <cmt>WP0216</cmt>
   <desc>WP0216</desc>
-<fix>none</fix><sat>2</sat></wpt>
+  <sat>2</sat>
+</wpt>
 <wpt lat="45.489761651" lon="-75.698398307">
   <ele>97.100000</ele>
 <time>2005-06-12T15:02:12Z</time>
   <name>WP0217</name>
   <cmt>WP0217</cmt>
   <desc>WP0217</desc>
-<fix>none</fix><sat>1</sat></wpt>
+  <sat>1</sat>
+</wpt>
 <wpt lat="45.489583318" lon="-75.695093307">
   <ele>97.400000</ele>
 <time>2005-06-12T15:02:28Z</time>
   <name>WP0218</name>
   <cmt>WP0218</cmt>
   <desc>WP0218</desc>
-<fix>none</fix><sat>0</sat></wpt>
+</wpt>
 <wpt lat="45.489726651" lon="-75.693488307">
   <ele>97.500000</ele>
 <time>2005-06-12T15:02:36Z</time>
   <name>WP0219</name>
   <cmt>WP0219</cmt>
   <desc>WP0219</desc>
-<fix>none</fix><sat>2</sat></wpt>
+  <sat>2</sat>
+</wpt>
 <wpt lat="45.489909984" lon="-75.693386640">
   <ele>97.500000</ele>
 <time>2005-06-12T15:02:37Z</time>
   <name>WP0220</name>
   <cmt>WP0220</cmt>
   <desc>WP0220</desc>
-<fix>none</fix><sat>1</sat></wpt>
+  <sat>1</sat>
+</wpt>
 <wpt lat="45.490408318" lon="-75.692841640">
   <ele>97.500000</ele>
 <time>2005-06-12T15:02:41Z</time>
   <name>WP0221</name>
   <cmt>WP0221</cmt>
   <desc>WP0221</desc>
-<fix>none</fix><sat>1</sat></wpt>
+  <sat>1</sat>
+</wpt>
 <wpt lat="45.490608318" lon="-75.692348307">
   <ele>97.400000</ele>
 <time>2005-06-12T15:02:44Z</time>
   <name>WP0222</name>
   <cmt>WP0222</cmt>
   <desc>WP0222</desc>
-<fix>none</fix><sat>1</sat></wpt>
+  <sat>1</sat>
+</wpt>
 <wpt lat="45.491079984" lon="-75.690218307">
   <ele>97.400000</ele>
 <time>2005-06-12T15:02:56Z</time>
   <name>WP0223</name>
   <cmt>WP0223</cmt>
   <desc>WP0223</desc>
-<fix>none</fix><sat>0</sat></wpt>
+</wpt>
 <wpt lat="45.491288318" lon="-75.688778307">
   <ele>97.300000</ele>
 <time>2005-06-12T15:03:04Z</time>
   <name>WP0224</name>
   <cmt>WP0224</cmt>
   <desc>WP0224</desc>
-<fix>none</fix><sat>2</sat></wpt>
+  <sat>2</sat>
+</wpt>
 <wpt lat="45.491183318" lon="-75.688611640">
   <ele>97.300000</ele>
 <time>2005-06-12T15:03:05Z</time>
   <name>WP0225</name>
   <cmt>WP0225</cmt>
   <desc>WP0225</desc>
-<fix>none</fix><sat>2</sat></wpt>
+  <sat>2</sat>
+</wpt>
 <wpt lat="45.490993318" lon="-75.688663307">
   <ele>99.000000</ele>
 <time>2005-06-12T15:03:06Z</time>
   <name>WP0226</name>
   <cmt>WP0226</cmt>
   <desc>WP0226</desc>
+  <fix>2d</fix>
+  <sat>3</sat>
   <pdop>2.000000</pdop>
-<fix>2d</fix><sat>3</sat></wpt>
+</wpt>
 <wpt lat="45.489688318" lon="-75.688748307">
   <ele>99.300000</ele>
 <time>2005-06-12T15:03:16Z</time>
   <name>WP0227</name>
   <cmt>WP0227</cmt>
   <desc>WP0227</desc>
-<fix>none</fix><sat>2</sat></wpt>
+  <sat>2</sat>
+</wpt>
 <wpt lat="45.489516651" lon="-75.688719974">
   <ele>99.200000</ele>
 <time>2005-06-12T15:03:20Z</time>
   <name>WP0228</name>
   <cmt>WP0228</cmt>
   <desc>WP0228</desc>
+  <fix>2d</fix>
+  <sat>3</sat>
   <pdop>2.000000</pdop>
-<fix>2d</fix><sat>3</sat></wpt>
+</wpt>
 <wpt lat="45.489606651" lon="-75.688778307">
   <ele>99.000000</ele>
 <time>2005-06-12T15:03:26Z</time>
   <name>WP0229</name>
   <cmt>WP0229</cmt>
   <desc>WP0229</desc>
+  <fix>2d</fix>
+  <sat>3</sat>
   <pdop>2.000000</pdop>
-<fix>2d</fix><sat>3</sat></wpt>
+</wpt>
 <wpt lat="45.489716651" lon="-75.688851640">
   <ele>98.600000</ele>
 <time>2005-06-12T15:03:53Z</time>
   <name>WP0230</name>
   <cmt>WP0230</cmt>
   <desc>WP0230</desc>
+  <fix>2d</fix>
+  <sat>3</sat>
   <pdop>2.000000</pdop>
-<fix>2d</fix><sat>3</sat></wpt>
+</wpt>
 <wpt lat="45.489636651" lon="-75.688773307">
   <ele>98.300000</ele>
 <time>2005-06-12T15:04:12Z</time>
   <name>WP0231</name>
   <cmt>WP0231</cmt>
   <desc>WP0231</desc>
-<fix>none</fix><sat>1</sat></wpt>
+  <sat>1</sat>
+</wpt>
 <wpt lat="45.489688318" lon="-75.688884974">
   <ele>98.000000</ele>
 <time>2005-06-12T15:04:34Z</time>
   <name>WP0232</name>
   <cmt>WP0232</cmt>
   <desc>WP0232</desc>
-<fix>none</fix><sat>1</sat></wpt>
+  <sat>1</sat>
+</wpt>
 <wpt lat="45.489699984" lon="-75.688648307">
   <ele>98.200000</ele>
 <time>2005-06-12T15:04:37Z</time>
   <name>WP0233</name>
   <cmt>WP0233</cmt>
   <desc>WP0233</desc>
-<fix>none</fix><sat>1</sat></wpt>
+  <sat>1</sat>
+</wpt>
 <wpt lat="45.489858318" lon="-75.688149974">
   <ele>98.400000</ele>
 <time>2005-06-12T15:04:43Z</time>
   <name>WP0234</name>
   <cmt>WP0234</cmt>
   <desc>WP0234</desc>
-<fix>none</fix><sat>1</sat></wpt>
+  <sat>1</sat>
+</wpt>
 <wpt lat="45.489979984" lon="-75.687781640">
   <ele>98.400000</ele>
 <time>2005-06-12T15:04:51Z</time>
   <name>WP0235</name>
   <cmt>WP0235</cmt>
   <desc>WP0235</desc>
+  <fix>2d</fix>
+  <sat>3</sat>
   <pdop>2.000000</pdop>
-<fix>2d</fix><sat>3</sat></wpt>
+</wpt>
 <wpt lat="45.489979984" lon="-75.687646640">
   <ele>98.100000</ele>
 <time>2005-06-12T15:05:11Z</time>
   <name>WP0236</name>
   <cmt>WP0236</cmt>
   <desc>WP0236</desc>
-<fix>none</fix><sat>2</sat></wpt>
+  <sat>2</sat>
+</wpt>
 <wpt lat="45.490004984" lon="-75.684934974">
   <ele>97.400000</ele>
 <time>2005-06-12T15:05:30Z</time>
   <name>WP0237</name>
   <cmt>WP0237</cmt>
   <desc>WP0237</desc>
-<fix>none</fix><sat>2</sat></wpt>
+  <sat>2</sat>
+</wpt>
 </gpx>
diff --git a/gpsbabel/vitosmt.c b/gpsbabel/vitosmt.c
index a75ea605c..fe51c783c 100644
--- a/gpsbabel/vitosmt.c
+++ b/gpsbabel/vitosmt.c
@@ -119,7 +119,6 @@ vitosmt_read(void)
 	unsigned char	gpsvalid		=0;
 	unsigned char	gpssats			=0;
 	int				serial			=0;
-	xml_tag *		xml_curr		=0;
 	char			buffer[80]		="\0";
 
 		
@@ -183,29 +182,16 @@ vitosmt_read(void)
 		*/
 		if (gpsvalid&0x7) {
 			
-			wpt_tmp->gpx_extras		=(xml_tag *)xcalloc(sizeof(xml_tag),1);
-				
 			/* <fix> */
-			xml_curr				=wpt_tmp->gpx_extras;
-			xml_curr->tagname		=xstrdup("fix");
 			if		(gpsfix&0x8)	
-				xml_curr->cdata		=xstrdup("2d");
+				wpt_tmp->fix = fix_2d;
 			else if	(gpsfix&0x10)	
-				xml_curr->cdata		=xstrdup("3d");
+				wpt_tmp->fix = fix_3d;
 			else if	(gpsfix&0x20)	
-				xml_curr->cdata		=xstrdup("dgps");
-			else
-				xml_curr->cdata		=xstrdup("none");
-			xml_curr->cdatalen 		=strlen(xml_curr->cdata);
+				wpt_tmp->fix = fix_dgps;
 			
 			/* <sat> */
-			xml_curr->sibling		=(xml_tag *)xcalloc(sizeof(xml_tag),1);
-			xml_curr				=xml_curr->sibling;
-			xml_curr->tagname		=xstrdup("sat");
-			snprintf(buffer, sizeof(buffer), "%d", gpssats);
-			xml_curr->cdata			=xstrdup(buffer);
-			xml_curr->cdatalen 		=strlen(xml_curr->cdata);
-			
+			wpt_tmp->sat = gpssats;
 		}
 
 		if (doing_wpts)			/* process as waypoints */
@@ -249,17 +235,6 @@ wr_deinit(void)
 
 }
 
-xml_tag *xml_find( xml_tag *cur, char *tagname ) 
-{
-	xml_tag *result = cur;
-	while ( result && case_ignore_strcmp( result->tagname, tagname ))
-	{
-		result = result->sibling;
-	} ;
-	return result;
-}
-
-
 static void
 vitosmt_waypt_pr(const waypoint *waypointp)
 {
@@ -268,7 +243,6 @@ vitosmt_waypt_pr(const waypoint *waypointp)
 	struct tm*		tmstructp		=0;
 	double			seconds			=0;
 	double			worknum			=0;
-	xml_tag*		xmltagp			=0;
 
 	++count;
 	workbuffer = xcalloc(vitosmt_datasize,1);
@@ -307,25 +281,23 @@ vitosmt_waypt_pr(const waypoint *waypointp)
 
 
 	/* fix type */
-	xmltagp = xml_find(waypointp->gpx_extras,"fix");
-	if (xmltagp) {
-		if		(case_ignore_strcmp(xmltagp->cdata,"dgps"))
+	switch (waypointp->fix) {
+		case fix_dgps:
 			workbuffer[position++] = (unsigned char) 0x20;
-		else if	(case_ignore_strcmp(xmltagp->cdata,"3d"))
+			break;
+		case fix_3d:
 			workbuffer[position++] = (unsigned char) 0x10;
-		else if	(case_ignore_strcmp(xmltagp->cdata,"2d"))
+			break;
+		case fix_2d:
 			workbuffer[position++] = (unsigned char) 0x08;
-		else
+			break;
+		default:
 			workbuffer[position++] = (unsigned char) 0;
-	}	
+			break;
+	}
 	
 	workbuffer[position++] = 0x7;
-	
-	xmltagp = xml_find(waypointp->gpx_extras,"sat");
-	if (xmltagp) {
-		workbuffer[position++] = (unsigned char) atoi(xmltagp->cdata);
-	}	
-
+	workbuffer[position++] = (unsigned char) waypointp->sat;
 	
 	if (fwrite(workbuffer,vitosmt_datasize,1,ofs)!=1)
 	{
-- 
2.30.2